diff options
| -rw-r--r-- | etc/message.xml | 9 | ||||
| -rw-r--r-- | indra/lib/python/indra/ipc/llsdhttp.py | 2 | ||||
| -rw-r--r-- | indra/llcommon/lllivefile.h | 2 | ||||
| -rw-r--r-- | indra/llmessage/llregionhandle.h | 2 | ||||
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 3 | ||||
| -rw-r--r-- | scripts/messages/message_template.msg | 2 |
6 files changed, 17 insertions, 3 deletions
diff --git a/etc/message.xml b/etc/message.xml index 331e6bb251..e4efeed05f 100644 --- a/etc/message.xml +++ b/etc/message.xml @@ -424,6 +424,15 @@ <key>trusted-sender</key> <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> diff --git a/indra/lib/python/indra/ipc/llsdhttp.py b/indra/lib/python/indra/ipc/llsdhttp.py index eb9247da93..0561cfd520 100644 --- a/indra/lib/python/indra/ipc/llsdhttp.py +++ b/indra/lib/python/indra/ipc/llsdhttp.py @@ -34,7 +34,7 @@ from indra.base import llsd from eventlet import httpc -suite = httpc.HttpSuite(llsd.format_xml, llsd.parse, 'application/xml+llsd') +suite = httpc.HttpSuite(llsd.format_xml, llsd.parse, 'application/llsd+xml') delete = suite.delete delete_ = suite.delete_ get = suite.get diff --git a/indra/llcommon/lllivefile.h b/indra/llcommon/lllivefile.h index 689590e324..7e24744491 100644 --- a/indra/llcommon/lllivefile.h +++ b/indra/llcommon/lllivefile.h @@ -32,6 +32,8 @@ #ifndef LL_LLLIVEFILE_H #define LL_LLLIVEFILE_H +const F32 configFileRefreshRate = 5.0; // seconds + class LLLiveFile { diff --git a/indra/llmessage/llregionhandle.h b/indra/llmessage/llregionhandle.h index d9fcd82936..c1f0dec74e 100644 --- a/indra/llmessage/llregionhandle.h +++ b/indra/llmessage/llregionhandle.h @@ -115,7 +115,7 @@ inline LLVector3d from_region_handle(const U64 ®ion_handle) // grid-based region handle encoding. pass in a grid position // (eg: 1000,1000) and this will return the region handle. -inline U64 grid_to_region_handle(U32 grid_x, U32 grid_y) +inline U64 grid_to_region_handle(const U32 grid_x, const U32 grid_y) { return to_region_handle(grid_x * REGION_WIDTH_UNITS, grid_y * REGION_WIDTH_UNITS); diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index fa9c9c9374..9ff5739255 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -80,6 +80,8 @@ const S32 TERRAIN_TEXTURE_COUNT = 4; const S32 CORNER_COUNT = 4; +extern LLString gLastVersionChannel; + ///---------------------------------------------------------------------------- /// Local class declaration @@ -317,6 +319,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg) // GENERAL PANEL panel = tab->getChild<LLPanel>("General"); panel->childSetValue("region_text", LLSD(sim_name)); + panel->childSetValue("version_channel_text", gLastVersionChannel); panel->childSetValue("block_terraform_check", (region_flags & REGION_FLAGS_BLOCK_TERRAFORM) ? TRUE : FALSE ); panel->childSetValue("block_fly_check", (region_flags & REGION_FLAGS_BLOCK_FLY) ? TRUE : FALSE ); diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index c5588f4301..761b6742db 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 + SimStats Low 140 Trusted Unencoded UDPDeprecated { Region Single { RegionX U32 } |