diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 37 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 21 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneViewer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs | 19 |
7 files changed, 36 insertions, 64 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 5ff9a38..ae4aad3 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -1045,6 +1045,19 @@ namespace OpenSim | |||
1045 | MainConsole.Instance.Output("Shared Module: " + module.Name); | 1045 | MainConsole.Instance.Output("Shared Module: " + module.Name); |
1046 | } | 1046 | } |
1047 | 1047 | ||
1048 | m_sceneManager.ForEachScene( | ||
1049 | delegate(Scene scene) | ||
1050 | { | ||
1051 | m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:"); | ||
1052 | foreach (IRegionModule module in scene.Modules.Values) | ||
1053 | { | ||
1054 | if (!module.IsSharedModule) | ||
1055 | { | ||
1056 | m_log.Error("Region Module: " + module.Name); | ||
1057 | } | ||
1058 | } | ||
1059 | }); | ||
1060 | |||
1048 | MainConsole.Instance.Output(""); | 1061 | MainConsole.Instance.Output(""); |
1049 | break; | 1062 | break; |
1050 | 1063 | ||
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 0fb346a..b49f23c 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -1180,7 +1180,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1180 | else | 1180 | else |
1181 | { | 1181 | { |
1182 | OSDArray responsearr = new OSDArray(); // Don't preallocate. MT (m_scene.GetRootAgentCount()); | 1182 | OSDArray responsearr = new OSDArray(); // Don't preallocate. MT (m_scene.GetRootAgentCount()); |
1183 | m_scene.ForEachScenePresence(delegate(ScenePresence sp) | 1183 | m_scene.ForEachRootScenePresence(delegate(ScenePresence sp) |
1184 | { | 1184 | { |
1185 | OSDMap responsemapdata = new OSDMap(); | 1185 | OSDMap responsemapdata = new OSDMap(); |
1186 | responsemapdata["X"] = OSD.FromInteger((int)(xstart + sp.AbsolutePosition.X)); | 1186 | responsemapdata["X"] = OSD.FromInteger((int)(xstart + sp.AbsolutePosition.X)); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0360942..c162519 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -86,7 +86,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
86 | public bool m_allowScriptCrossings; | 86 | public bool m_allowScriptCrossings; |
87 | public bool m_useFlySlow; | 87 | public bool m_useFlySlow; |
88 | public bool m_usePreJump; | 88 | public bool m_usePreJump; |
89 | public bool m_seeIntoRegionFromNeighbor; | ||
90 | 89 | ||
91 | protected float m_defaultDrawDistance = 255.0f; | 90 | protected float m_defaultDrawDistance = 255.0f; |
92 | public float DefaultDrawDistance | 91 | public float DefaultDrawDistance |
@@ -660,14 +659,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
660 | 659 | ||
661 | m_physics_enabled = !RegionInfo.RegionSettings.DisablePhysics; | 660 | m_physics_enabled = !RegionInfo.RegionSettings.DisablePhysics; |
662 | 661 | ||
663 | // Old | ||
664 | /* | ||
665 | m_simulatorVersion = simulatorVersion | ||
666 | + " (OS " + Util.GetOperatingSystemInformation() + ")" | ||
667 | + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() | ||
668 | + " PhysPrim:" + m_physicalPrim.ToString(); | ||
669 | */ | ||
670 | |||
671 | m_simulatorVersion = simulatorVersion + " (" + Util.GetRuntimeInformation() + ")"; | 662 | m_simulatorVersion = simulatorVersion + " (" + Util.GetRuntimeInformation() + ")"; |
672 | 663 | ||
673 | #region Region Config | 664 | #region Region Config |
@@ -714,7 +705,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
714 | m_clampPrimSize = true; | 705 | m_clampPrimSize = true; |
715 | } | 706 | } |
716 | 707 | ||
717 | m_seeIntoRegionFromNeighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); | ||
718 | m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); | 708 | m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); |
719 | m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); | 709 | m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); |
720 | m_dontPersistBefore = | 710 | m_dontPersistBefore = |
@@ -4201,33 +4191,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4201 | } | 4191 | } |
4202 | } | 4192 | } |
4203 | 4193 | ||
4204 | public override void Show(string[] showParams) | ||
4205 | { | ||
4206 | base.Show(showParams); | ||
4207 | |||
4208 | switch (showParams[0]) | ||
4209 | { | ||
4210 | case "users": | ||
4211 | m_log.Error("Current Region: " + RegionInfo.RegionName); | ||
4212 | m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", | ||
4213 | "Agent ID", "Session ID", "Circuit", "IP", "World"); | ||
4214 | |||
4215 | ForEachScenePresence(delegate(ScenePresence sp) | ||
4216 | { | ||
4217 | m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", | ||
4218 | sp.Firstname, | ||
4219 | sp.Lastname, | ||
4220 | sp.UUID, | ||
4221 | sp.ControllingClient.AgentId, | ||
4222 | "Unknown", | ||
4223 | "Unknown", | ||
4224 | RegionInfo.RegionName); | ||
4225 | }); | ||
4226 | |||
4227 | break; | ||
4228 | } | ||
4229 | } | ||
4230 | |||
4231 | #region Script Handling Methods | 4194 | #region Script Handling Methods |
4232 | 4195 | ||
4233 | /// <summary> | 4196 | /// <summary> |
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index bf861b8..73e9392 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -458,27 +458,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
458 | #endregion | 458 | #endregion |
459 | 459 | ||
460 | /// <summary> | 460 | /// <summary> |
461 | /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain. | ||
462 | /// </summary> | ||
463 | /// <param name="showParams">What to show</param> | ||
464 | public virtual void Show(string[] showParams) | ||
465 | { | ||
466 | switch (showParams[0]) | ||
467 | { | ||
468 | case "modules": | ||
469 | m_log.Error("The currently loaded modules in " + RegionInfo.RegionName + " are:"); | ||
470 | foreach (IRegionModule module in Modules.Values) | ||
471 | { | ||
472 | if (!module.IsSharedModule) | ||
473 | { | ||
474 | m_log.Error("Region Module: " + module.Name); | ||
475 | } | ||
476 | } | ||
477 | break; | ||
478 | } | ||
479 | } | ||
480 | |||
481 | /// <summary> | ||
482 | /// Call this from a region module to add a command to the OpenSim console. | 461 | /// Call this from a region module to add a command to the OpenSim console. |
483 | /// </summary> | 462 | /// </summary> |
484 | /// <param name="mod"></param> | 463 | /// <param name="mod"></param> |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index d8939fc..bba746f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2927,7 +2927,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2927 | // only send update from root agents to other clients; children are only "listening posts" | 2927 | // only send update from root agents to other clients; children are only "listening posts" |
2928 | if (IsChildAgent) | 2928 | if (IsChildAgent) |
2929 | { | 2929 | { |
2930 | m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent"); | 2930 | m_log.Warn("[SCENE PRESENCE]: Attempt to send avatar data from a child agent"); |
2931 | return; | 2931 | return; |
2932 | } | 2932 | } |
2933 | 2933 | ||
@@ -2984,10 +2984,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2984 | // only send update from root agents to other clients; children are only "listening posts" | 2984 | // only send update from root agents to other clients; children are only "listening posts" |
2985 | if (IsChildAgent) | 2985 | if (IsChildAgent) |
2986 | { | 2986 | { |
2987 | m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent"); | 2987 | m_log.Warn("[SCENE PRESENCE]: Attempt to send avatar data from a child agent"); |
2988 | return; | 2988 | return; |
2989 | } | 2989 | } |
2990 | 2990 | ||
2991 | int count = 0; | 2991 | int count = 0; |
2992 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) | 2992 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) |
2993 | { | 2993 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index 8a0d288..092b76e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs | |||
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
84 | { | 84 | { |
85 | if (m_pendingObjects == null) | 85 | if (m_pendingObjects == null) |
86 | { | 86 | { |
87 | if (!m_presence.IsChildAgent || (m_presence.Scene.m_seeIntoRegionFromNeighbor)) | 87 | if (!m_presence.IsChildAgent) |
88 | { | 88 | { |
89 | m_pendingObjects = new Queue<SceneObjectGroup>(); | 89 | m_pendingObjects = new Queue<SceneObjectGroup>(); |
90 | 90 | ||
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs index 2cef8a9..f8120aa 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs | |||
@@ -98,7 +98,24 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance | |||
98 | "Show appearance information for each avatar in the simulator.", | 98 | "Show appearance information for each avatar in the simulator.", |
99 | "At the moment this actually just checks that we have all the required baked textures. If not, then appearance is 'corrupt' and other avatars will continue to see a cloud.", | 99 | "At the moment this actually just checks that we have all the required baked textures. If not, then appearance is 'corrupt' and other avatars will continue to see a cloud.", |
100 | ShowAppearanceInfo); | 100 | ShowAppearanceInfo); |
101 | } | 101 | |
102 | scene.AddCommand( | ||
103 | this, "appearance send", | ||
104 | "appearance send", | ||
105 | "Send appearance data for each avatar in the simulator to viewers.", | ||
106 | SendAppearance); | ||
107 | } | ||
108 | |||
109 | private void SendAppearance(string module, string[] cmd) | ||
110 | { | ||
111 | lock (m_scenes) | ||
112 | { | ||
113 | foreach (Scene scene in m_scenes.Values) | ||
114 | { | ||
115 | scene.ForEachRootScenePresence(sp => scene.AvatarFactory.SendAppearance(sp.UUID)); | ||
116 | } | ||
117 | } | ||
118 | } | ||
102 | 119 | ||
103 | protected void ShowAppearanceInfo(string module, string[] cmd) | 120 | protected void ShowAppearanceInfo(string module, string[] cmd) |
104 | { | 121 | { |