From d307109e1af20c5b1b27743853236d7842d871f0 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 13 Feb 2009 19:03:18 +0000 Subject: * refactor: move alert commands from Scene to DialogModule --- OpenSim/Region/Framework/Scenes/Scene.cs | 30 ------------------------- OpenSim/Region/Framework/Scenes/SceneManager.cs | 10 --------- 2 files changed, 40 deletions(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 18e729f..611b9db 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -2213,7 +2213,6 @@ namespace OpenSim.Region.Framework.Scenes { lock (av) { - for (int i = 0; i < regionslst.Count; i++) { av.KnownChildRegionHandles.Remove(regionslst[i]); @@ -2902,35 +2901,6 @@ namespace OpenSim.Region.Framework.Scenes } } - /// - /// Handle an alert command from the console. - /// FIXME: Command parsing code really shouldn't be in this core Scene class. - /// - /// - public void HandleAlertCommand(string[] commandParams) - { - if (commandParams[0] == "general") - { - string message = CombineParams(commandParams, 1); - m_dialogModule.SendGeneralAlert(message); - } - else - { - string message = CombineParams(commandParams, 2); - m_dialogModule.SendAlertToUser(commandParams[0], commandParams[1], message, false); - } - } - - private string CombineParams(string[] commandParams, int pos) - { - string result = String.Empty; - for (int i = pos; i < commandParams.Length; i++) - { - result += commandParams[i] + " "; - } - return result; - } - #endregion /// diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 180f8a1..fe37dae 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs @@ -296,16 +296,6 @@ namespace OpenSim.Region.Framework.Scenes ForEachCurrentScene(delegate(Scene scene) { scene.Backup(); }); } - public void HandleAlertCommandOnCurrentScene(string[] cmdparams) - { - ForEachCurrentScene(delegate(Scene scene) { scene.HandleAlertCommand(cmdparams); }); - } - - public void SendGeneralMessage(string msg) - { - ForEachCurrentScene(delegate(Scene scene) { scene.HandleAlertCommand(new string[] { "general", msg }); }); - } - public bool TrySetCurrentScene(string regionName) { if ((String.Compare(regionName, "root") == 0) -- cgit v1.1