aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-29 18:39:33 +0000
committerJustin Clarke Casey2009-01-29 18:39:33 +0000
commit6e63e93ec77bb214c3cd897ec512243cb70fd2cf (patch)
treef55396a2117e08a401c2e200cae78d17a9c3e6eb /OpenSim/Region
parent* Enhanced ScenePresenceTests. Now tests for region and prim crossing. (diff)
downloadopensim-SC_OLD-6e63e93ec77bb214c3cd897ec512243cb70fd2cf.zip
opensim-SC_OLD-6e63e93ec77bb214c3cd897ec512243cb70fd2cf.tar.gz
opensim-SC_OLD-6e63e93ec77bb214c3cd897ec512243cb70fd2cf.tar.bz2
opensim-SC_OLD-6e63e93ec77bb214c3cd897ec512243cb70fd2cf.tar.xz
* minor: just a few formatting changes and log quietening
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
3 files changed, 12 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
index 3977963..dec4ca0 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -134,7 +134,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
134 // try child avatar second 134 // try child avatar second
135 foreach (Scene scene in m_Scenes) 135 foreach (Scene scene in m_Scenes)
136 { 136 {
137 m_log.DebugFormat("[INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID.ToString(), scene.RegionInfo.RegionName); 137// m_log.DebugFormat(
138// "[INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID, scene.RegionInfo.RegionName);
138 139
139 if (scene.Entities.ContainsKey(toAgentID) && 140 if (scene.Entities.ContainsKey(toAgentID) &&
140 scene.Entities[toAgentID] is ScenePresence) 141 scene.Entities[toAgentID] is ScenePresence)
@@ -161,13 +162,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
161 162
162 if (m_Gridmode) 163 if (m_Gridmode)
163 { 164 {
164 m_log.DebugFormat("[INSTANT MESSAGE]: Delivering via grid"); 165 //m_log.DebugFormat("[INSTANT MESSAGE]: Delivering via grid");
165 // Still here, try send via Grid 166 // Still here, try send via Grid
166 SendGridInstantMessageViaXMLRPC(im, result); 167 SendGridInstantMessageViaXMLRPC(im, result);
167 return; 168 return;
168 } 169 }
169 170
170 m_log.DebugFormat("[INSTANT MESSAGE]: Undeliverable"); 171 //m_log.DebugFormat("[INSTANT MESSAGE]: Undeliverable");
171 result(false); 172 result(false);
172 return; 173 return;
173 } 174 }
@@ -184,7 +185,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
184 185
185 // TODO: For now, as IMs seem to be a bit unreliable on OSGrid, catch all exception that 186 // TODO: For now, as IMs seem to be a bit unreliable on OSGrid, catch all exception that
186 // happen here and aren't caught and log them. 187 // happen here and aren't caught and log them.
187 try { 188 try
189 {
188 // various rational defaults 190 // various rational defaults
189 UUID fromAgentID = UUID.Zero; 191 UUID fromAgentID = UUID.Zero;
190 UUID toAgentID = UUID.Zero; 192 UUID toAgentID = UUID.Zero;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 7436d75..f6ebbc9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -597,6 +597,7 @@ namespace OpenSim.Region.Environment.Scenes
597 597
598 if (!m_isBackedUp) 598 if (!m_isBackedUp)
599 m_scene.EventManager.OnBackup += ProcessBackup; 599 m_scene.EventManager.OnBackup += ProcessBackup;
600
600 m_isBackedUp = true; 601 m_isBackedUp = true;
601 } 602 }
602 } 603 }
@@ -1282,7 +1283,10 @@ namespace OpenSim.Region.Environment.Scenes
1282 1283
1283 datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); 1284 datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
1284 1285
1285 backup_group.ForEachPart(delegate(SceneObjectPart part) { part.Inventory.ProcessInventoryBackup(datastore); }); 1286 backup_group.ForEachPart(delegate(SceneObjectPart part)
1287 {
1288 part.Inventory.ProcessInventoryBackup(datastore);
1289 });
1286 1290
1287 backup_group = null; 1291 backup_group = null;
1288 } 1292 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 2b6d08d..9e76ee2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
186 186
187 if (!m_FunctionPerms.ContainsKey(function)) 187 if (!m_FunctionPerms.ContainsKey(function))
188 { 188 {
189 string perm = m_ScriptEngine.Config.GetString("Allow_"+function, ""); 189 string perm = m_ScriptEngine.Config.GetString("Allow_" + function, "");
190 if (perm == "") 190 if (perm == "")
191 { 191 {
192 m_FunctionPerms[function] = null; // a null value is default 192 m_FunctionPerms[function] = null; // a null value is default