diff options
author | Dr Scofield | 2009-03-12 18:51:28 +0000 |
---|---|---|
committer | Dr Scofield | 2009-03-12 18:51:28 +0000 |
commit | fa619bdf8c2e7d935f662a2f9d289c78ce618192 (patch) | |
tree | 0d72600377766468b1ca654a25f4bdee65c27b55 /OpenSim/Region | |
parent | * Move SceneObject tests into their proper namespace (diff) | |
download | opensim-SC-fa619bdf8c2e7d935f662a2f9d289c78ce618192.zip opensim-SC-fa619bdf8c2e7d935f662a2f9d289c78ce618192.tar.gz opensim-SC-fa619bdf8c2e7d935f662a2f9d289c78ce618192.tar.bz2 opensim-SC-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 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/RegionReady/RegionReady.cs | 10 |
1 files changed, 7 insertions, 3 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; |