svn merge -r 75354:76103...
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
Showing
- etc/message.xml 17 additions, 1 deletionetc/message.xml
- indra/llcharacter/llhandmotion.h 2 additions, 0 deletionsindra/llcharacter/llhandmotion.h
- indra/llcommon/lldefs.h 17 additions, 1 deletionindra/llcommon/lldefs.h
- indra/llcommon/llevent.h 1 addition, 1 deletionindra/llcommon/llevent.h
- indra/llcommon/llmortician.cpp 6 additions, 6 deletionsindra/llcommon/llmortician.cpp
- indra/llcommon/llmortician.h 2 additions, 0 deletionsindra/llcommon/llmortician.h
- indra/llcommon/llsdutil.cpp 120 additions, 0 deletionsindra/llcommon/llsdutil.cpp
- indra/llcommon/llsdutil.h 10 additions, 0 deletionsindra/llcommon/llsdutil.h
- indra/llcommon/llstring.h 38 additions, 1 deletionindra/llcommon/llstring.h
- indra/llcommon/roles_constants.h 11 additions, 9 deletionsindra/llcommon/roles_constants.h
- indra/llinventory/lluserrelations.cpp 5 additions, 0 deletionsindra/llinventory/lluserrelations.cpp
- indra/llinventory/lluserrelations.h 13 additions, 2 deletionsindra/llinventory/lluserrelations.h
- indra/llmath/llrect.h 6 additions, 1 deletionindra/llmath/llrect.h
- indra/llmath/v3color.h 1 addition, 0 deletionsindra/llmath/v3color.h
- indra/llmath/v4color.h 1 addition, 0 deletionsindra/llmath/v4color.h
- indra/llmessage/lliohttpserver.cpp 1 addition, 1 deletionindra/llmessage/lliohttpserver.cpp
- indra/llmessage/message.cpp 33 additions, 17 deletionsindra/llmessage/message.cpp
- indra/llrender/llimagegl.h 0 additions, 10 deletionsindra/llrender/llimagegl.h
- indra/llui/llbutton.cpp 142 additions, 135 deletionsindra/llui/llbutton.cpp
- indra/llui/llbutton.h 26 additions, 42 deletionsindra/llui/llbutton.h
Loading
Please register or sign in to comment