diff options
author | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
commit | 16b6738cdadc70966a93b6d025ae469738955dcb (patch) | |
tree | 7a3c0075e9ee5fd04d972bc52be38aec4d51f648 /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |
parent | DNE code cleanups (diff) | |
download | opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.zip opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.gz opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.bz2 opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.xz |
* Patch from JHurliman
* Updates to libomv r2243,
* Remove lots of unnecessary typecasts
* Improves SendWindData()
Thanks jhurliman.
* Will update OpenSim-libs in 10 minutes..
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 1c924c0..6ffb8ec 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -206,7 +206,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
206 | throw new Exception("wrong password"); | 206 | throw new Exception("wrong password"); |
207 | 207 | ||
208 | string file = (string)requestData["filename"]; | 208 | string file = (string)requestData["filename"]; |
209 | UUID regionID = (string) requestData["regionid"]; | 209 | UUID regionID = (UUID)(string) requestData["regionid"]; |
210 | m_log.InfoFormat("[RADMIN]: Terrain Loading: {0}", file); | 210 | m_log.InfoFormat("[RADMIN]: Terrain Loading: {0}", file); |
211 | 211 | ||
212 | responseData["accepted"] = "true"; | 212 | responseData["accepted"] = "true"; |
@@ -389,7 +389,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
389 | if (requestData.ContainsKey("region_id") && | 389 | if (requestData.ContainsKey("region_id") && |
390 | !String.IsNullOrEmpty((string)requestData["region_id"])) | 390 | !String.IsNullOrEmpty((string)requestData["region_id"])) |
391 | { | 391 | { |
392 | regionID = (string)requestData["region_id"]; | 392 | regionID = (UUID)(string)requestData["region_id"]; |
393 | if (m_app.SceneManager.TryGetScene(regionID, out scene)) | 393 | if (m_app.SceneManager.TryGetScene(regionID, out scene)) |
394 | throw new Exception(String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>", | 394 | throw new Exception(String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>", |
395 | scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, | 395 | scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, |
@@ -810,7 +810,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
810 | Scene scene = null; | 810 | Scene scene = null; |
811 | if (requestData.Contains("region_uuid")) | 811 | if (requestData.Contains("region_uuid")) |
812 | { | 812 | { |
813 | UUID region_uuid = (string)requestData["region_uuid"]; | 813 | UUID region_uuid = (UUID)(string)requestData["region_uuid"]; |
814 | if (!m_app.SceneManager.TryGetScene(region_uuid, out scene)) | 814 | if (!m_app.SceneManager.TryGetScene(region_uuid, out scene)) |
815 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); | 815 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); |
816 | } | 816 | } |
@@ -870,7 +870,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
870 | string filename = (string)requestData["filename"]; | 870 | string filename = (string)requestData["filename"]; |
871 | if (requestData.Contains("region_uuid")) | 871 | if (requestData.Contains("region_uuid")) |
872 | { | 872 | { |
873 | UUID region_uuid = (string)requestData["region_uuid"]; | 873 | UUID region_uuid = (UUID)(string)requestData["region_uuid"]; |
874 | if (!m_app.SceneManager.TrySetCurrentScene(region_uuid)) | 874 | if (!m_app.SceneManager.TrySetCurrentScene(region_uuid)) |
875 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); | 875 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); |
876 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); | 876 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); |
@@ -951,7 +951,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
951 | string filename = (string)requestData["filename"]; | 951 | string filename = (string)requestData["filename"]; |
952 | if (requestData.Contains("region_uuid")) | 952 | if (requestData.Contains("region_uuid")) |
953 | { | 953 | { |
954 | UUID region_uuid = (string)requestData["region_uuid"]; | 954 | UUID region_uuid = (UUID)(string)requestData["region_uuid"]; |
955 | if (!m_app.SceneManager.TrySetCurrentScene(region_uuid)) | 955 | if (!m_app.SceneManager.TrySetCurrentScene(region_uuid)) |
956 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); | 956 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); |
957 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); | 957 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); |