svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
Showing
- etc/message.xml 7 additions, 0 deletionsetc/message.xml
- indra/llcommon/llstringtable.h 7 additions, 1 deletionindra/llcommon/llstringtable.h
- indra/llinventory/llparcel.cpp 2 additions, 0 deletionsindra/llinventory/llparcel.cpp
- indra/llinventory/llparcel.h 4 additions, 2 deletionsindra/llinventory/llparcel.h
- indra/llui/llbutton.cpp 1 addition, 1 deletionindra/llui/llbutton.cpp
- indra/llui/llcallbackmap.h 0 additions, 4 deletionsindra/llui/llcallbackmap.h
- indra/llui/lllineeditor.cpp 5 additions, 0 deletionsindra/llui/lllineeditor.cpp
- indra/llui/llmenugl.cpp 13 additions, 5 deletionsindra/llui/llmenugl.cpp
- indra/llui/llmenugl.h 7 additions, 6 deletionsindra/llui/llmenugl.h
- indra/llui/llresmgr.cpp 5 additions, 4 deletionsindra/llui/llresmgr.cpp
- indra/llui/llresmgr.h 1 addition, 1 deletionindra/llui/llresmgr.h
- indra/llui/lltexteditor.cpp 23 additions, 11 deletionsindra/llui/lltexteditor.cpp
- indra/llui/llui.h 1 addition, 0 deletionsindra/llui/llui.h
- indra/llxml/llcontrol.cpp 1 addition, 1 deletionindra/llxml/llcontrol.cpp
- indra/llxml/llxmlnode.h 2 additions, 1 deletionindra/llxml/llxmlnode.h
- indra/newview/llagent.cpp 23 additions, 6 deletionsindra/newview/llagent.cpp
- indra/newview/llagent.h 4 additions, 2 deletionsindra/newview/llagent.h
- indra/newview/llclassifiedstatsresponder.cpp 57 additions, 0 deletionsindra/newview/llclassifiedstatsresponder.cpp
- indra/newview/llclassifiedstatsresponder.h 28 additions, 0 deletionsindra/newview/llclassifiedstatsresponder.h
- indra/newview/llfloaterevent.cpp 107 additions, 0 deletionsindra/newview/llfloaterevent.cpp
Loading
Please register or sign in to comment