From a089a401ee39c016d7d5c950d4f36e170c5a00e4 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Mon, 28 Apr 2008 19:40:54 +0000 Subject: 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 --- scripts/messages/message_template.msg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts') 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 -- cgit v1.2.3