diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-04-28 19:40:54 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-04-28 19:40:54 +0000 |
| commit | a089a401ee39c016d7d5c950d4f36e170c5a00e4 (patch) | |
| tree | 7c260ffdd929f64c52e946e67b761b16717ed7ee /etc | |
| parent | b580951a9e4279f04ea342d49c517091cb989a57 (diff) | |
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
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/message.xml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/etc/message.xml b/etc/message.xml index 38415159a1..701d049678 100644 --- a/etc/message.xml +++ b/etc/message.xml @@ -425,15 +425,6 @@ <boolean>true</boolean> </map> - <!-- Server to dataserver and client --> - <key>SimStats</key> - <map> - <key>flavor</key> - <string>llsd</string> - <key>trusted-sender</key> - <boolean>true</boolean> - </map> - <!-- UDPDeprecated Messages --> <key>ScriptRunningReply</key> <map> |