From 16b6738cdadc70966a93b6d025ae469738955dcb Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Fri, 26 Sep 2008 17:25:22 +0000
Subject: * Patch from JHurliman * Updates to libomv r2243, * Remove lots of
 unnecessary typecasts * Improves SendWindData() Thanks jhurliman. * Will
 update OpenSim-libs in 10 minutes..

---
 .../ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')

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
                     throw new Exception("wrong password");
 
                 string file = (string)requestData["filename"];
-                UUID regionID = (string) requestData["regionid"];
+                UUID regionID = (UUID)(string) requestData["regionid"];
                 m_log.InfoFormat("[RADMIN]: Terrain Loading: {0}", file);
 
                 responseData["accepted"] = "true";
@@ -389,7 +389,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (requestData.ContainsKey("region_id") &&
                     !String.IsNullOrEmpty((string)requestData["region_id"]))
                 {
-                    regionID = (string)requestData["region_id"];
+                    regionID = (UUID)(string)requestData["region_id"];
                     if (m_app.SceneManager.TryGetScene(regionID, out scene))
                         throw new Exception(String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>",
                                                           scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
@@ -810,7 +810,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 Scene scene = null;
                 if (requestData.Contains("region_uuid"))
                 {
-                    UUID region_uuid = (string)requestData["region_uuid"];
+                    UUID region_uuid = (UUID)(string)requestData["region_uuid"];
                     if (!m_app.SceneManager.TryGetScene(region_uuid, out scene))
                         throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
                 }
@@ -870,7 +870,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 string filename = (string)requestData["filename"];
                 if (requestData.Contains("region_uuid"))
                 {
-                    UUID region_uuid = (string)requestData["region_uuid"];
+                    UUID region_uuid = (UUID)(string)requestData["region_uuid"];
                     if (!m_app.SceneManager.TrySetCurrentScene(region_uuid))
                         throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString());
@@ -951,7 +951,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 string filename = (string)requestData["filename"];
                 if (requestData.Contains("region_uuid"))
                 {
-                    UUID region_uuid = (string)requestData["region_uuid"];
+                    UUID region_uuid = (UUID)(string)requestData["region_uuid"];
                     if (!m_app.SceneManager.TrySetCurrentScene(region_uuid))
                         throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString());
-- 
cgit v1.1