aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2009-03-12 18:51:28 +0000
committerDr Scofield2009-03-12 18:51:28 +0000
commitfa619bdf8c2e7d935f662a2f9d289c78ce618192 (patch)
tree0d72600377766468b1ca654a25f4bdee65c27b55
parent* Move SceneObject tests into their proper namespace (diff)
downloadopensim-SC_OLD-fa619bdf8c2e7d935f662a2f9d289c78ce618192.zip
opensim-SC_OLD-fa619bdf8c2e7d935f662a2f9d289c78ce618192.tar.gz
opensim-SC_OLD-fa619bdf8c2e7d935f662a2f9d289c78ce618192.tar.bz2
opensim-SC_OLD-fa619bdf8c2e7d935f662a2f9d289c78ce618192.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs10
-rw-r--r--bin/OpenSim.ini.example11
-rw-r--r--bin/config.preview.donotuseyet/region/scripting/regionready.ini.example7
3 files changed, 17 insertions, 11 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs
index f9c22ee..6035712 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs
@@ -107,17 +107,21 @@ namespace OpenSim.Region.CoreModules.Scripting.RegionReady
107 { 107 {
108 if (m_firstEmptyCompileQueue || m_oarFileLoading) 108 if (m_firstEmptyCompileQueue || m_oarFileLoading)
109 { 109 {
110 OSChatMessage c = new OSChatMessage();
111 if (m_firstEmptyCompileQueue)
112 c.Message = "server_startup,";
113 else
114 c.Message = "oar_file_load,";
110 m_firstEmptyCompileQueue = false; 115 m_firstEmptyCompileQueue = false;
111 m_oarFileLoading = false; 116 m_oarFileLoading = false;
112 117
113 m_scene.Backup(); 118 m_scene.Backup();
114 119
115 OSChatMessage c = new OSChatMessage();
116 c.From = "RegionReady"; 120 c.From = "RegionReady";
117 if (m_lastOarLoadedOk) 121 if (m_lastOarLoadedOk)
118 c.Message = "1,"; 122 c.Message += "1,";
119 else 123 else
120 c.Message = "0,"; 124 c.Message += "0,";
121 c.Channel = m_channelNotify; 125 c.Channel = m_channelNotify;
122 c.Message += numScriptsFailed.ToString() + "," + message; 126 c.Message += numScriptsFailed.ToString() + "," + message;
123 c.Type = ChatTypeEnum.Region; 127 c.Type = ChatTypeEnum.Region;
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index ef72dc4..e2ae33c 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1100,11 +1100,12 @@ InterregionComms = "RESTComms"
1100 ; default is false 1100 ; default is false
1101 enabled = false 1101 enabled = false
1102 1102
1103 ; Channel on which to signal region readiness through a message 1103 ; Channel on which to signal region readiness through a message
1104 ; formatted as follows: "{0|1},n,[oar error]" 1104 ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]"
1105 ; - the first number indicating whether the OAR file loaded ok (1 == ok, 0 == error) 1105 ; - the first field indicating whether this is an initial server startup
1106 ; - the second number indicates how many scrips failed to compile 1106 ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
1107 ; - "oar error" if supplied, provides the error message from the OAR load 1107 ; - the third field is a number indicating how many scripts failed to compile
1108 ; - "oar error" if supplied, provides the error message from the OAR load
1108 channel_notify = -800 1109 channel_notify = -800
1109 1110
1110 1111
diff --git a/bin/config.preview.donotuseyet/region/scripting/regionready.ini.example b/bin/config.preview.donotuseyet/region/scripting/regionready.ini.example
index 611b81b..e64139e 100644
--- a/bin/config.preview.donotuseyet/region/scripting/regionready.ini.example
+++ b/bin/config.preview.donotuseyet/region/scripting/regionready.ini.example
@@ -12,8 +12,9 @@
12 enabled = false 12 enabled = false
13 13
14 ; Channel on which to signal region readiness through a message 14 ; Channel on which to signal region readiness through a message
15 ; formatted as follows: "{0|1},n,[oar error]" 15 ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]"
16 ; - the first number indicating whether the OAR file loaded ok (1 == ok, 0 == error) 16 ; - the first field indicating whether this is an initial server startup
17 ; - the second number indicates how many scrips failed to compile 17 ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
18 ; - the third field is a number indicating how many scripts failed to compile
18 ; - "oar error" if supplied, provides the error message from the OAR load 19 ; - "oar error" if supplied, provides the error message from the OAR load
19 channel_notify = -800 20 channel_notify = -800