aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
diff options
context:
space:
mode:
authorsacha2010-12-04 21:50:48 +0000
committersacha2010-12-04 21:50:48 +0000
commit835103af82eb0b8c0916bbbe3c5a981e92e5a47e (patch)
tree154f02cada4bf550b7278aef31c42f9ba8da3ef5 /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
parentadd more detail to the log in case of FORM Timeout (diff)
parentAdd some safeguards: DOn't send someone else's HUDs, don't send deleted prims (diff)
downloadopensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.zip
opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.tar.gz
opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.tar.bz2
opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index a75cc60..9659883 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -2636,8 +2636,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2636 string text; 2636 string text;
2637 int health = scene.GetHealth(out flags, out text); 2637 int health = scene.GetHealth(out flags, out text);
2638 responseData["health"] = health; 2638 responseData["health"] = health;
2639 responseData["flags"] = health; 2639 responseData["flags"] = flags;
2640 responseData["message"] = health; 2640 responseData["message"] = text;
2641 2641
2642 response.Value = responseData; 2642 response.Value = responseData;
2643 } 2643 }