From: Christopher Yeoh <yeohc@au1.ibm.com>
Patch to RegionReady which adds a field which adds to the message whether the region is ready due to a server startup or due to an oar file loading.0.6.5-rc1
parent
a02c3caa0d
commit
fa619bdf8c
|
@ -107,17 +107,21 @@ namespace OpenSim.Region.CoreModules.Scripting.RegionReady
|
|||
{
|
||||
if (m_firstEmptyCompileQueue || m_oarFileLoading)
|
||||
{
|
||||
OSChatMessage c = new OSChatMessage();
|
||||
if (m_firstEmptyCompileQueue)
|
||||
c.Message = "server_startup,";
|
||||
else
|
||||
c.Message = "oar_file_load,";
|
||||
m_firstEmptyCompileQueue = false;
|
||||
m_oarFileLoading = false;
|
||||
|
||||
m_scene.Backup();
|
||||
|
||||
OSChatMessage c = new OSChatMessage();
|
||||
c.From = "RegionReady";
|
||||
if (m_lastOarLoadedOk)
|
||||
c.Message = "1,";
|
||||
c.Message += "1,";
|
||||
else
|
||||
c.Message = "0,";
|
||||
c.Message += "0,";
|
||||
c.Channel = m_channelNotify;
|
||||
c.Message += numScriptsFailed.ToString() + "," + message;
|
||||
c.Type = ChatTypeEnum.Region;
|
||||
|
|
|
@ -1100,11 +1100,12 @@ InterregionComms = "RESTComms"
|
|||
; default is false
|
||||
enabled = false
|
||||
|
||||
; Channel on which to signal region readiness through a message
|
||||
; formatted as follows: "{0|1},n,[oar error]"
|
||||
; - the first number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
|
||||
; - the second number indicates how many scrips failed to compile
|
||||
; - "oar error" if supplied, provides the error message from the OAR load
|
||||
; Channel on which to signal region readiness through a message
|
||||
; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]"
|
||||
; - the first field indicating whether this is an initial server startup
|
||||
; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
|
||||
; - the third field is a number indicating how many scripts failed to compile
|
||||
; - "oar error" if supplied, provides the error message from the OAR load
|
||||
channel_notify = -800
|
||||
|
||||
|
||||
|
|
|
@ -12,8 +12,9 @@
|
|||
enabled = false
|
||||
|
||||
; Channel on which to signal region readiness through a message
|
||||
; formatted as follows: "{0|1},n,[oar error]"
|
||||
; - the first number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
|
||||
; - the second number indicates how many scrips failed to compile
|
||||
; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]"
|
||||
; - the first field indicating whether this is an initial server startup
|
||||
; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
|
||||
; - the third field is a number indicating how many scripts failed to compile
|
||||
; - "oar error" if supplied, provides the error message from the OAR load
|
||||
channel_notify = -800
|
||||
|
|
Loading…
Reference in New Issue