aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs30
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs10
2 files changed, 0 insertions, 40 deletions
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
2213 { 2213 {
2214 lock (av) 2214 lock (av)
2215 { 2215 {
2216
2217 for (int i = 0; i < regionslst.Count; i++) 2216 for (int i = 0; i < regionslst.Count; i++)
2218 { 2217 {
2219 av.KnownChildRegionHandles.Remove(regionslst[i]); 2218 av.KnownChildRegionHandles.Remove(regionslst[i]);
@@ -2902,35 +2901,6 @@ namespace OpenSim.Region.Framework.Scenes
2902 } 2901 }
2903 } 2902 }
2904 2903
2905 /// <summary>
2906 /// Handle an alert command from the console.
2907 /// FIXME: Command parsing code really shouldn't be in this core Scene class.
2908 /// </summary>
2909 /// <param name="commandParams"></param>
2910 public void HandleAlertCommand(string[] commandParams)
2911 {
2912 if (commandParams[0] == "general")
2913 {
2914 string message = CombineParams(commandParams, 1);
2915 m_dialogModule.SendGeneralAlert(message);
2916 }
2917 else
2918 {
2919 string message = CombineParams(commandParams, 2);
2920 m_dialogModule.SendAlertToUser(commandParams[0], commandParams[1], message, false);
2921 }
2922 }
2923
2924 private string CombineParams(string[] commandParams, int pos)
2925 {
2926 string result = String.Empty;
2927 for (int i = pos; i < commandParams.Length; i++)
2928 {
2929 result += commandParams[i] + " ";
2930 }
2931 return result;
2932 }
2933
2934 #endregion 2904 #endregion
2935 2905
2936 /// <summary> 2906 /// <summary>
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
296 ForEachCurrentScene(delegate(Scene scene) { scene.Backup(); }); 296 ForEachCurrentScene(delegate(Scene scene) { scene.Backup(); });
297 } 297 }
298 298
299 public void HandleAlertCommandOnCurrentScene(string[] cmdparams)
300 {
301 ForEachCurrentScene(delegate(Scene scene) { scene.HandleAlertCommand(cmdparams); });
302 }
303
304 public void SendGeneralMessage(string msg)
305 {
306 ForEachCurrentScene(delegate(Scene scene) { scene.HandleAlertCommand(new string[] { "general", msg }); });
307 }
308
309 public bool TrySetCurrentScene(string regionName) 299 public bool TrySetCurrentScene(string regionName)
310 { 300 {
311 if ((String.Compare(regionName, "root") == 0) 301 if ((String.Compare(regionName, "root") == 0)