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

Backport fix of inventory skeleton fetch from XInventoryServicesConnector. 

This is not used by login if the inventory service and login service are housed in the same ROBUST instance (which is the default config)
0.7.3-extended
Justin Clark-Casey (justincc) 2012-08-02 01:55:44 +01:00
parent fa3ebd85c9
commit 092e94035b
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/Application/OpenSim.cs
View File

@ -948,14 +948,8 @@ namespace OpenSim
IList agents; IList agents;
if (showParams.Length > 1 && showParams[1] == "full") if (showParams.Length > 1 && showParams[1] == "full")
{ {
<<<<<<< HEAD
agents = m_sceneManager.GetCurrentScenePresences();
}
else
=======
agents = SceneManager.GetCurrentScenePresences(); agents = SceneManager.GetCurrentScenePresences();
} else } else
>>>>>>> a1e9964... Add experimental "OpenSim object memory churn" statistics to output of region console "show stats" command
{ {
agents = SceneManager.GetCurrentSceneAvatars(); agents = SceneManager.GetCurrentSceneAvatars();
} }
@ -1036,17 +1030,10 @@ namespace OpenSim
MainConsole.Instance.Output("Shared Module: " + module.Name); MainConsole.Instance.Output("Shared Module: " + module.Name);
} }
<<<<<<< HEAD
m_sceneManager.ForEachScene(
delegate(Scene scene)
=======
SceneManager.ForEachScene( SceneManager.ForEachScene(
delegate(Scene scene) { delegate(Scene scene) {
m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:"); m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:");
foreach (IRegionModule module in scene.Modules.Values)
>>>>>>> a1e9964... Add experimental "OpenSim object memory churn" statistics to output of region console "show stats" command
{
m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:");
foreach (IRegionModule module in scene.Modules.Values) foreach (IRegionModule module in scene.Modules.Values)
{ {
if (!module.IsSharedModule) if (!module.IsSharedModule)
@ -1054,10 +1041,6 @@ namespace OpenSim
m_log.Error("Region Module: " + module.Name); m_log.Error("Region Module: " + module.Name);
} }
} }
<<<<<<< HEAD
});
=======
}
} }
); );
@ -1072,7 +1055,6 @@ namespace OpenSim
} }
} }
); );
>>>>>>> a1e9964... Add experimental "OpenSim object memory churn" statistics to output of region console "show stats" command
MainConsole.Instance.Output(""); MainConsole.Instance.Output("");
break; break;
@ -1349,7 +1331,7 @@ namespace OpenSim
return; return;
} }
m_sceneManager.ForEachScene( SceneManager.ForEachScene(
delegate(Scene scene) delegate(Scene scene)
{ {
SceneObjectPart part = scene.GetSceneObjectPart(id); SceneObjectPart part = scene.GetSceneObjectPart(id);

10
OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
View File

@ -109,19 +109,21 @@ namespace OpenSim.Services.Connectors
if (ret.Count == 0) if (ret.Count == 0)
return null; return null;
List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); Dictionary<string, object> folders = (Dictionary<string, object>)ret["FOLDERS"];
List<InventoryFolderBase> fldrs = new List<InventoryFolderBase>();
try try
{ {
foreach (Object o in ret.Values) foreach (Object o in folders.Values)
folders.Add(BuildFolder((Dictionary<string, object>)o)); fldrs.Add(BuildFolder((Dictionary<string, object>)o));
} }
catch (Exception e) catch (Exception e)
{ {
m_log.DebugFormat("[XINVENTORY CONNECTOR STUB]: Exception unwrapping folder list: {0}", e.Message); m_log.DebugFormat("[XINVENTORY CONNECTOR STUB]: Exception unwrapping folder list: {0}", e.Message);
} }
return folders; return fldrs;
} }
public InventoryFolderBase GetRootFolder(UUID principalID) public InventoryFolderBase GetRootFolder(UUID principalID)