From 3c55f3015f5c9bffa3580abf310fc52598fd7d6f Mon Sep 17 00:00:00 2001 From: Dan Lake Date: Mon, 31 Oct 2011 16:42:28 -0700 Subject: Removed unused show commands from Scene.cs and SceneBase.cs. The show modules command in OpenSim.cs now shows both shared modules and region modules. --- OpenSim/Region/Framework/Scenes/Scene.cs | 27 --------------------------- OpenSim/Region/Framework/Scenes/SceneBase.cs | 21 --------------------- 2 files changed, 48 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes') diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 7a5160c..e054f1b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -4028,33 +4028,6 @@ namespace OpenSim.Region.Framework.Scenes } } - public override void Show(string[] showParams) - { - base.Show(showParams); - - switch (showParams[0]) - { - case "users": - m_log.Error("Current Region: " + RegionInfo.RegionName); - m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", - "Agent ID", "Session ID", "Circuit", "IP", "World"); - - ForEachScenePresence(delegate(ScenePresence sp) - { - m_log.ErrorFormat("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", - sp.Firstname, - sp.Lastname, - sp.UUID, - sp.ControllingClient.AgentId, - "Unknown", - "Unknown", - RegionInfo.RegionName); - }); - - break; - } - } - #region Script Handling Methods /// diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index ec94f10..dee2ecb 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs @@ -456,27 +456,6 @@ namespace OpenSim.Region.Framework.Scenes #endregion /// - /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain. - /// - /// What to show - public virtual void Show(string[] showParams) - { - switch (showParams[0]) - { - case "modules": - m_log.Error("The currently loaded modules in " + RegionInfo.RegionName + " are:"); - foreach (IRegionModule module in Modules.Values) - { - if (!module.IsSharedModule) - { - m_log.Error("Region Module: " + module.Name); - } - } - break; - } - } - - /// /// Call this from a region module to add a command to the OpenSim console. /// /// -- cgit v1.1 From 9456a540c50b90d2c2cdb1b556e9d6190f817426 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 1 Nov 2011 23:23:45 +0000 Subject: Add "appearance send" command to allow manual sending of appearance. --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes') diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index bb820aa..29966f9 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -2575,7 +2575,7 @@ namespace OpenSim.Region.Framework.Scenes // only send update from root agents to other clients; children are only "listening posts" if (IsChildAgent) { - m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent"); + m_log.Warn("[SCENE PRESENCE]: Attempt to send avatar data from a child agent"); return; } @@ -2632,10 +2632,10 @@ namespace OpenSim.Region.Framework.Scenes // only send update from root agents to other clients; children are only "listening posts" if (IsChildAgent) { - m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent"); + m_log.Warn("[SCENE PRESENCE]: Attempt to send avatar data from a child agent"); return; } - + int count = 0; m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) { -- cgit v1.1 From 4b58d4ff95891e5d0f15801c8a48c57309925738 Mon Sep 17 00:00:00 2001 From: Dan Lake Date: Tue, 1 Nov 2011 16:51:14 -0700 Subject: Removed see_into_this_sim_from_neighbor configuration option. --- OpenSim/Region/Framework/Scenes/Scene.cs | 10 ---------- OpenSim/Region/Framework/Scenes/SceneViewer.cs | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes') diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e054f1b..086de53 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -86,7 +86,6 @@ namespace OpenSim.Region.Framework.Scenes public bool m_allowScriptCrossings; public bool m_useFlySlow; public bool m_usePreJump; - public bool m_seeIntoRegionFromNeighbor; protected float m_defaultDrawDistance = 255.0f; public float DefaultDrawDistance @@ -638,14 +637,6 @@ namespace OpenSim.Region.Framework.Scenes m_physics_enabled = !RegionInfo.RegionSettings.DisablePhysics; - // Old - /* - m_simulatorVersion = simulatorVersion - + " (OS " + Util.GetOperatingSystemInformation() + ")" - + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() - + " PhysPrim:" + m_physicalPrim.ToString(); - */ - m_simulatorVersion = simulatorVersion + " (" + Util.GetRuntimeInformation() + ")"; #region Region Config @@ -690,7 +681,6 @@ namespace OpenSim.Region.Framework.Scenes m_clampPrimSize = true; } - m_seeIntoRegionFromNeighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); m_dontPersistBefore = diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index 50e1e39..ded90a3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs @@ -84,7 +84,7 @@ namespace OpenSim.Region.Framework.Scenes { if (m_pendingObjects == null) { - if (!m_presence.IsChildAgent || (m_presence.Scene.m_seeIntoRegionFromNeighbor)) + if (!m_presence.IsChildAgent) { m_pendingObjects = new Queue(); -- cgit v1.1