From 2b4de8f8817e823221aad6a753fe31b1bbb73c58 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 7 Dec 2011 22:40:23 +0000
Subject: Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods
 return success = true on success rather than false

---
 OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 1da7c35..8a1718f 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -339,7 +339,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             LoadHeightmap(file, regionID);
 
-            responseData["success"] = false;
+            responseData["success"] = true;
 
             m_log.Info("[RADMIN]: Load height maps request complete");
         }
@@ -371,7 +371,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             terrainModule.SaveToFile(file);
 
-            responseData["success"] = false;
+            responseData["success"] = true;
 
             m_log.Info("[RADMIN]: Save height maps request complete");
         }
-- 
cgit v1.1


From dae58e093700b3afaa3e09ccbe1f52a329316303 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 7 Dec 2011 22:42:05 +0000
Subject: Remove warning in admin_save_oar xmlrpc method where noassets == true
 was comparing against an object rather than a string

---
 OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 8a1718f..64b2a52 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1464,7 +1464,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     options["profile"] = (string)requestData["profile"];
                 }
 
-                if (requestData["noassets"] == "true")
+                if (requestData["noassets"].ToString() == "true")
                 {
                     options["noassets"] = (string)requestData["noassets"] ;
                 }
-- 
cgit v1.1