From 6e63e93ec77bb214c3cd897ec512243cb70fd2cf Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 29 Jan 2009 18:39:33 +0000 Subject: * minor: just a few formatting changes and log quietening --- .../Modules/Avatar/InstantMessage/MessageTransferModule.cs | 10 ++++++---- OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 6 +++++- .../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 +- 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 // try child avatar second foreach (Scene scene in m_Scenes) { - m_log.DebugFormat("[INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID.ToString(), scene.RegionInfo.RegionName); +// m_log.DebugFormat( +// "[INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID, scene.RegionInfo.RegionName); if (scene.Entities.ContainsKey(toAgentID) && scene.Entities[toAgentID] is ScenePresence) @@ -161,13 +162,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage if (m_Gridmode) { - m_log.DebugFormat("[INSTANT MESSAGE]: Delivering via grid"); + //m_log.DebugFormat("[INSTANT MESSAGE]: Delivering via grid"); // Still here, try send via Grid SendGridInstantMessageViaXMLRPC(im, result); return; } - m_log.DebugFormat("[INSTANT MESSAGE]: Undeliverable"); + //m_log.DebugFormat("[INSTANT MESSAGE]: Undeliverable"); result(false); return; } @@ -184,7 +185,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage // TODO: For now, as IMs seem to be a bit unreliable on OSGrid, catch all exception that // happen here and aren't caught and log them. - try { + try + { // various rational defaults UUID fromAgentID = UUID.Zero; 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 if (!m_isBackedUp) m_scene.EventManager.OnBackup += ProcessBackup; + m_isBackedUp = true; } } @@ -1282,7 +1283,10 @@ namespace OpenSim.Region.Environment.Scenes datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); - backup_group.ForEachPart(delegate(SceneObjectPart part) { part.Inventory.ProcessInventoryBackup(datastore); }); + backup_group.ForEachPart(delegate(SceneObjectPart part) + { + part.Inventory.ProcessInventoryBackup(datastore); + }); backup_group = null; } 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 if (!m_FunctionPerms.ContainsKey(function)) { - string perm = m_ScriptEngine.Config.GetString("Allow_"+function, ""); + string perm = m_ScriptEngine.Config.GetString("Allow_" + function, ""); if (perm == "") { m_FunctionPerms[function] = null; // a null value is default -- cgit v1.1