diff options
author | Melanie Thielker | 2008-10-09 20:27:41 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-10-09 20:27:41 +0000 |
commit | d016d82f0c8b3bca1a6c3548cb61a78cc247ab32 (patch) | |
tree | c8473b7ec34e356e19b600dafa1087e53c538f6b /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |
parent | * minor: get rid of an unecessary casting and logic check (diff) | |
download | opensim-SC_OLD-d016d82f0c8b3bca1a6c3548cb61a78cc247ab32.zip opensim-SC_OLD-d016d82f0c8b3bca1a6c3548cb61a78cc247ab32.tar.gz opensim-SC_OLD-d016d82f0c8b3bca1a6c3548cb61a78cc247ab32.tar.bz2 opensim-SC_OLD-d016d82f0c8b3bca1a6c3548cb61a78cc247ab32.tar.xz |
Small remote admin cleanups/additions
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index eaab61c..3a64ec2 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -125,6 +125,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
125 | UUID regionID = new UUID((string) requestData["regionID"]); | 125 | UUID regionID = new UUID((string) requestData["regionID"]); |
126 | 126 | ||
127 | responseData["accepted"] = "true"; | 127 | responseData["accepted"] = "true"; |
128 | responseData["success"] = "true"; | ||
128 | response.Value = responseData; | 129 | response.Value = responseData; |
129 | 130 | ||
130 | Scene rebootedScene; | 131 | Scene rebootedScene; |
@@ -133,6 +134,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
133 | throw new Exception("region not found"); | 134 | throw new Exception("region not found"); |
134 | 135 | ||
135 | responseData["rebooting"] = "true"; | 136 | responseData["rebooting"] = "true"; |
137 | response.Value = responseData; | ||
136 | rebootedScene.Restart(30); | 138 | rebootedScene.Restart(30); |
137 | } | 139 | } |
138 | catch(Exception e) | 140 | catch(Exception e) |
@@ -167,6 +169,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
167 | m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message); | 169 | m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message); |
168 | 170 | ||
169 | responseData["accepted"] = "true"; | 171 | responseData["accepted"] = "true"; |
172 | responseData["success"] = "true"; | ||
170 | response.Value = responseData; | 173 | response.Value = responseData; |
171 | 174 | ||
172 | m_app.SceneManager.SendGeneralMessage(message); | 175 | m_app.SceneManager.SendGeneralMessage(message); |
@@ -441,6 +444,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
441 | region.MasterAvatarFirstName = (string) requestData["region_master_first"]; | 444 | region.MasterAvatarFirstName = (string) requestData["region_master_first"]; |
442 | region.MasterAvatarLastName = (string) requestData["region_master_last"]; | 445 | region.MasterAvatarLastName = (string) requestData["region_master_last"]; |
443 | region.MasterAvatarSandboxPassword = (string) requestData["region_master_password"]; | 446 | region.MasterAvatarSandboxPassword = (string) requestData["region_master_password"]; |
447 | region.MasterAvatarAssignedUUID = new UUID(requestData["region_master_uuid"].ToString()); | ||
444 | 448 | ||
445 | bool persist = Convert.ToBoolean((string)requestData["persist"]); | 449 | bool persist = Convert.ToBoolean((string)requestData["persist"]); |
446 | if (persist) | 450 | if (persist) |