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

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

0.7.4.1
Justin Clark-Casey (justincc) 2012-06-05 00:15:29 +01:00
parent a7f4804f53 3229e32b4e
commit c3d9acc9a9
5 changed files with 50 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -971,8 +971,7 @@ namespace OpenSim
if (showParams.Length > 1 && showParams[1] == "full") if (showParams.Length > 1 && showParams[1] == "full")
{ {
agents = m_sceneManager.GetCurrentScenePresences(); agents = m_sceneManager.GetCurrentScenePresences();
} } else
else
{ {
agents = m_sceneManager.GetCurrentSceneAvatars(); agents = m_sceneManager.GetCurrentSceneAvatars();
} }
@ -981,7 +980,8 @@ namespace OpenSim
MainConsole.Instance.Output( MainConsole.Instance.Output(
String.Format("{0,-16} {1,-16} {2,-37} {3,-11} {4,-16} {5,-30}", "Firstname", "Lastname", String.Format("{0,-16} {1,-16} {2,-37} {3,-11} {4,-16} {5,-30}", "Firstname", "Lastname",
"Agent ID", "Root/Child", "Region", "Position")); "Agent ID", "Root/Child", "Region", "Position")
);
foreach (ScenePresence presence in agents) foreach (ScenePresence presence in agents)
{ {
@ -991,8 +991,7 @@ namespace OpenSim
if (regionInfo == null) if (regionInfo == null)
{ {
regionName = "Unresolvable"; regionName = "Unresolvable";
} } else
else
{ {
regionName = regionInfo.RegionName; regionName = regionInfo.RegionName;
} }
@ -1005,7 +1004,8 @@ namespace OpenSim
presence.UUID, presence.UUID,
presence.IsChildAgent ? "Child" : "Root", presence.IsChildAgent ? "Child" : "Root",
regionName, regionName,
presence.AbsolutePosition.ToString())); presence.AbsolutePosition.ToString())
);
} }
MainConsole.Instance.Output(String.Empty); MainConsole.Instance.Output(String.Empty);
@ -1014,16 +1014,20 @@ namespace OpenSim
case "connections": case "connections":
System.Text.StringBuilder connections = new System.Text.StringBuilder("Connections:\n"); System.Text.StringBuilder connections = new System.Text.StringBuilder("Connections:\n");
m_sceneManager.ForEachScene( m_sceneManager.ForEachScene(
delegate(Scene scene) delegate(Scene scene) {
{ scene.ForEachClient(
scene.ForEachClient( delegate(IClientAPI client) {
delegate(IClientAPI client) connections.AppendFormat(
{ "{0}: {1} ({2}) from {3} on circuit {4}\n",
connections.AppendFormat("{0}: {1} ({2}) from {3} on circuit {4}\n", scene.RegionInfo.RegionName,
scene.RegionInfo.RegionName, client.Name, client.AgentId, client.RemoteEndPoint, client.CircuitCode); client.Name,
} client.AgentId,
client.RemoteEndPoint,
client.CircuitCode
); );
} }
);
}
); );
MainConsole.Instance.Output(connections.ToString()); MainConsole.Instance.Output(connections.ToString());
@ -1032,13 +1036,17 @@ namespace OpenSim
case "circuits": case "circuits":
System.Text.StringBuilder acd = new System.Text.StringBuilder("Agent Circuits:\n"); System.Text.StringBuilder acd = new System.Text.StringBuilder("Agent Circuits:\n");
m_sceneManager.ForEachScene( m_sceneManager.ForEachScene(
delegate(Scene scene) delegate(Scene scene) {
{ //this.HttpServer.
//this.HttpServer. acd.AppendFormat("{0}:\n", scene.RegionInfo.RegionName);
acd.AppendFormat("{0}:\n", scene.RegionInfo.RegionName); foreach (AgentCircuitData aCircuit in scene.AuthenticateHandler.GetAgentCircuits().Values)
foreach (AgentCircuitData aCircuit in scene.AuthenticateHandler.GetAgentCircuits().Values) acd.AppendFormat(
acd.AppendFormat("\t{0} {1} ({2})\n", aCircuit.firstname, aCircuit.lastname, (aCircuit.child ? "Child" : "Root")); "\t{0} {1} ({2})\n",
} aCircuit.firstname,
aCircuit.lastname,
(aCircuit.child ? "Child" : "Root")
);
}
); );
MainConsole.Instance.Output(acd.ToString()); MainConsole.Instance.Output(acd.ToString());
@ -1079,17 +1087,29 @@ namespace OpenSim
} }
m_sceneManager.ForEachScene( m_sceneManager.ForEachScene(
delegate(Scene scene) delegate(Scene scene) {
m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:");
foreach (IRegionModule module in scene.Modules.Values)
{ {
m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:"); if (!module.IsSharedModule)
foreach (IRegionModule module in scene.Modules.Values)
{ {
if (!module.IsSharedModule) m_log.Error("Region Module: " + module.Name);
{
m_log.Error("Region Module: " + module.Name);
}
} }
}); }
}
);
m_sceneManager.ForEachScene(
delegate(Scene scene) {
MainConsole.Instance.Output("Loaded new region modules in" + scene.RegionInfo.RegionName + " are:");
foreach (IRegionModuleBase module in scene.RegionModules.Values)
{
Type type = module.GetType().GetInterface("ISharedRegionModule");
string module_type = type != null ? "Shared" : "Non-Shared";
MainConsole.Instance.OutputFormat("New Region Module ({0}): {1}", module_type, module.Name);
}
}
);
MainConsole.Instance.Output(""); MainConsole.Instance.Output("");
break; break;

8
OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
View File

@ -57,14 +57,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
public void Initialise(IConfigSource config) public void Initialise(IConfigSource config)
{ {
// This can be reduced later as the loader will determine
// whether we are needed
if (config.Configs["Profile"] != null)
{
if (config.Configs["Profile"].GetString("Module", string.Empty) != "BasicProfileModule")
return;
}
m_log.DebugFormat("[PROFILE MODULE]: Basic Profile Module enabled"); m_log.DebugFormat("[PROFILE MODULE]: Basic Profile Module enabled");
m_Enabled = true; m_Enabled = true;
} }

2
OpenSim/Region/Framework/Scenes/EventManager.cs
View File

@ -923,7 +923,7 @@ namespace OpenSim.Region.Framework.Scenes
OnTerrainTaintedDelegate handlerTerrainTainted = OnTerrainTainted; OnTerrainTaintedDelegate handlerTerrainTainted = OnTerrainTainted;
if (handlerTerrainTainted != null) if (handlerTerrainTainted != null)
{ {
foreach (OnTerrainTickDelegate d in handlerTerrainTainted.GetInvocationList()) foreach (OnTerrainTaintedDelegate d in handlerTerrainTainted.GetInvocationList())
{ {
try try
{ {

3
bin/config-include/Grid.ini
View File

@ -29,9 +29,6 @@
SimulationServiceInConnector = true SimulationServiceInConnector = true
LibraryModule = true LibraryModule = true
[Profile]
Module = "BasicProfileModule"
[SimulationDataStore] [SimulationDataStore]
LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"

3
bin/config-include/Standalone.ini
View File

@ -25,9 +25,6 @@
GridInfoServiceInConnector = true GridInfoServiceInConnector = true
MapImageServiceInConnector = true MapImageServiceInConnector = true
[Profile]
Module = "BasicProfileModule"
[SimulationDataStore] [SimulationDataStore]
LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"