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 /scripts | |
| 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 'scripts')
| -rw-r--r-- | scripts/messages/message_template.msg | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index 761b6742db..abd25bfb29 100644 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -2853,7 +2853,7 @@ version 2.0 // Simulator statistics packet (goes out to viewer and dataserver/spaceserver) { - SimStats Low 140 Trusted Unencoded UDPDeprecated + SimStats Low 140 Trusted Unencoded { Region Single { RegionX U32 } @@ -2866,6 +2866,10 @@ version 2.0 { StatID U32 } { StatValue F32 } } + { + PidStat Single + { PID S32 } + } } // viewer -> sim |