aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorAdam Frisby2007-10-25 12:13:58 +0000
committerAdam Frisby2007-10-25 12:13:58 +0000
commit2048d611cf2ecccfbdb6b234c995e19d72ad03f2 (patch)
treea7cbc539a7e69cb1f8e70a094df8e26048d07375 /OpenSim/Region/Environment
parentCreated a generic RESTClient component, which simplifies querying for resourc... (diff)
downloadopensim-SC_OLD-2048d611cf2ecccfbdb6b234c995e19d72ad03f2.zip
opensim-SC_OLD-2048d611cf2ecccfbdb6b234c995e19d72ad03f2.tar.gz
opensim-SC_OLD-2048d611cf2ecccfbdb6b234c995e19d72ad03f2.tar.bz2
opensim-SC_OLD-2048d611cf2ecccfbdb6b234c995e19d72ad03f2.tar.xz
* Added XMLRPC Controller Module to OpenSimMain which allows XML-RPC queries to be sent to the core application.
* Disabled by default, but has two functions so far -- shutdown (timed or now), and create-region. * Added SendGeneralAlert function to SceneManager allowing all-user alerts to be sent from OpenSimMain.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs8
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 84eb503..d7c1759 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1319,7 +1319,6 @@ namespace OpenSim.Region.Environment.Scenes
1319 SendAlertToUser(user, reason, false); 1319 SendAlertToUser(user, reason, false);
1320 } 1320 }
1321 1321
1322
1323 public void SendGeneralAlert(string message) 1322 public void SendGeneralAlert(string message)
1324 { 1323 {
1325 foreach (ScenePresence presence in m_scenePresences.Values) 1324 foreach (ScenePresence presence in m_scenePresences.Values)
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 3fe9479..7db6927 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -150,6 +150,14 @@ namespace OpenSim.Region.Environment.Scenes
150 ForEachCurrentScene(delegate(Scene scene) { scene.HandleAlertCommand(cmdparams); }); 150 ForEachCurrentScene(delegate(Scene scene) { scene.HandleAlertCommand(cmdparams); });
151 } 151 }
152 152
153 public void SendGeneralMessage(string msg)
154 {
155 ForEachCurrentScene(delegate(Scene scene)
156 {
157 scene.SendGeneralAlert(msg);
158 });
159 }
160
153 public bool TrySetCurrentScene(string regionName) 161 public bool TrySetCurrentScene(string regionName)
154 { 162 {
155 if ((String.Compare(regionName, "root") == 0) || (String.Compare(regionName, "..") == 0)) 163 if ((String.Compare(regionName, "root") == 0) || (String.Compare(regionName, "..") == 0))