livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9 

QAR-431
master
Leyla Farazha 2008-04-08 21:04:41 +00:00
parent f5e386527c
commit b73ad51784
6 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etc/message.xml
View File

@ -424,6 +424,15 @@
<key>trusted-sender</key> <key>trusted-sender</key>
<boolean>true</boolean> <boolean>true</boolean>
</map> </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 --> <!-- UDPDeprecated Messages -->
<key>ScriptRunningReply</key> <key>ScriptRunningReply</key>

2
indra/lib/python/indra/ipc/llsdhttp.py
View File

@ -34,7 +34,7 @@ from indra.base import llsd
from eventlet import httpc 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
delete_ = suite.delete_ delete_ = suite.delete_
get = suite.get get = suite.get

2
indra/llcommon/lllivefile.h
View File

@ -32,6 +32,8 @@
#ifndef LL_LLLIVEFILE_H #ifndef LL_LLLIVEFILE_H
#define LL_LLLIVEFILE_H #define LL_LLLIVEFILE_H
const F32 configFileRefreshRate = 5.0; // seconds
class LLLiveFile class LLLiveFile
{ {

2
indra/llmessage/llregionhandle.h
View File

@ -115,7 +115,7 @@ inline LLVector3d from_region_handle(const U64 &region_handle)
// grid-based region handle encoding. pass in a grid position // grid-based region handle encoding. pass in a grid position
// (eg: 1000,1000) and this will return the region handle. // (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, return to_region_handle(grid_x * REGION_WIDTH_UNITS,
grid_y * REGION_WIDTH_UNITS); grid_y * REGION_WIDTH_UNITS);

3
indra/newview/llfloaterregioninfo.cpp
View File

@ -80,6 +80,8 @@
const S32 TERRAIN_TEXTURE_COUNT = 4; const S32 TERRAIN_TEXTURE_COUNT = 4;
const S32 CORNER_COUNT = 4; const S32 CORNER_COUNT = 4;
extern LLString gLastVersionChannel;
///---------------------------------------------------------------------------- ///----------------------------------------------------------------------------
/// Local class declaration /// Local class declaration
@ -317,6 +319,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
// GENERAL PANEL // GENERAL PANEL
panel = tab->getChild<LLPanel>("General"); panel = tab->getChild<LLPanel>("General");
panel->childSetValue("region_text", LLSD(sim_name)); 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_terraform_check", (region_flags & REGION_FLAGS_BLOCK_TERRAFORM) ? TRUE : FALSE );
panel->childSetValue("block_fly_check", (region_flags & REGION_FLAGS_BLOCK_FLY) ? TRUE : FALSE ); panel->childSetValue("block_fly_check", (region_flags & REGION_FLAGS_BLOCK_FLY) ? TRUE : FALSE );

2
scripts/messages/message_template.msg
View File

@ -2853,7 +2853,7 @@ version 2.0
// Simulator statistics packet (goes out to viewer and dataserver/spaceserver) // Simulator statistics packet (goes out to viewer and dataserver/spaceserver)
{ {
SimStats Low 140 Trusted Unencoded SimStats Low 140 Trusted Unencoded UDPDeprecated
{ {
Region Single Region Single
{ RegionX U32 } { RegionX U32 }