svn merge -r 84911:86069...
svn merge -r 84911:86069 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release Backport fixes made in the production branch to the trunk now that it is live on the grid: * DEV-14443 Launcher not producing colo prefix when looking up sim class * DEV-10840 "/etc/init.d/backbone stop" returns before all child backbones exited; "backbone restart" results in defunct children * DEV-12558: Able to make anyone's object shout error messages * QAR-483 user start location migration prelude * QAR-490 havok4-6 * Revert havok4-5/4-6 code changes causing parcel access check issues * Revert QAR-277 sqlite-backbone * DEV-12357 SEC-53: Script that crashes regions * QAR-486 New proc and query for Web Classifieds Fix
Showing
- etc/message.xml 0 additions, 9 deletionsetc/message.xml
- indra/lib/python/indra/base/llsd.py 12 additions, 0 deletionsindra/lib/python/indra/base/llsd.py
- indra/llcommon/llsdutil.h 12 additions, 0 deletionsindra/llcommon/llsdutil.h
- indra/llcommon/llversionserver.h 2 additions, 2 deletionsindra/llcommon/llversionserver.h
- indra/llmath/llvolume.cpp 3 additions, 2 deletionsindra/llmath/llvolume.cpp
- indra/llmessage/llhttpclient.h 6 additions, 1 deletionindra/llmessage/llhttpclient.h
- indra/lscript/lscript_execute/lscript_execute.cpp 8 additions, 1 deletionindra/lscript/lscript_execute/lscript_execute.cpp
- scripts/messages/message_template.msg 5 additions, 1 deletionscripts/messages/message_template.msg
Loading
Please register or sign in to comment