OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: just a few formatting changes and log quietening

0.6.3-post-fixes
Justin Clarke Casey 2009-01-29 18:39:33 +00:00
parent 25e241837b
commit 6e63e93ec7
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
View File

@ -134,7 +134,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
// try child avatar second // try child avatar second
foreach (Scene scene in m_Scenes) 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) && if (scene.Entities.ContainsKey(toAgentID) &&
scene.Entities[toAgentID] is ScenePresence) scene.Entities[toAgentID] is ScenePresence)
@ -161,13 +162,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
if (m_Gridmode) 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 // Still here, try send via Grid
SendGridInstantMessageViaXMLRPC(im, result); SendGridInstantMessageViaXMLRPC(im, result);
return; return;
} }
m_log.DebugFormat("[INSTANT MESSAGE]: Undeliverable"); //m_log.DebugFormat("[INSTANT MESSAGE]: Undeliverable");
result(false); result(false);
return; 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 // 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. // happen here and aren't caught and log them.
try { try
{
// various rational defaults // various rational defaults
UUID fromAgentID = UUID.Zero; UUID fromAgentID = UUID.Zero;
UUID toAgentID = UUID.Zero; UUID toAgentID = UUID.Zero;

6
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -597,6 +597,7 @@ namespace OpenSim.Region.Environment.Scenes
if (!m_isBackedUp) if (!m_isBackedUp)
m_scene.EventManager.OnBackup += ProcessBackup; m_scene.EventManager.OnBackup += ProcessBackup;
m_isBackedUp = true; m_isBackedUp = true;
} }
} }
@ -1282,7 +1283,10 @@ namespace OpenSim.Region.Environment.Scenes
datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); 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; backup_group = null;
} }

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -186,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!m_FunctionPerms.ContainsKey(function)) if (!m_FunctionPerms.ContainsKey(function))
{ {
string perm = m_ScriptEngine.Config.GetString("Allow_"+function, ""); string perm = m_ScriptEngine.Config.GetString("Allow_" + function, "");
if (perm == "") if (perm == "")
{ {
m_FunctionPerms[function] = null; // a null value is default m_FunctionPerms[function] = null; // a null value is default