diff options
| author | Melanie | 2011-12-08 03:53:30 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-08 03:53:30 +0000 |
| commit | ea1f5fb08d7b9b5e15f4fbcb29591949239b0fb2 (patch) | |
| tree | 787c93d90dd7dd439618b91140a89e0679724869 /OpenSim | |
| parent | Adapt to justincc's remote admin refactor (diff) | |
| parent | Remove warning in admin_save_oar xmlrpc method where noassets == true was com... (diff) | |
| download | opensim-SC-ea1f5fb08d7b9b5e15f4fbcb29591949239b0fb2.zip opensim-SC-ea1f5fb08d7b9b5e15f4fbcb29591949239b0fb2.tar.gz opensim-SC-ea1f5fb08d7b9b5e15f4fbcb29591949239b0fb2.tar.bz2 opensim-SC-ea1f5fb08d7b9b5e15f4fbcb29591949239b0fb2.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 1cc0da2..9298726 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -414,7 +414,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 414 | 414 | ||
| 415 | LoadHeightmap(file, regionID); | 415 | LoadHeightmap(file, regionID); |
| 416 | 416 | ||
| 417 | responseData["success"] = false; | 417 | responseData["success"] = true; |
| 418 | 418 | ||
| 419 | m_log.Info("[RADMIN]: Load height maps request complete"); | 419 | m_log.Info("[RADMIN]: Load height maps request complete"); |
| 420 | } | 420 | } |
| @@ -446,7 +446,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 446 | 446 | ||
| 447 | terrainModule.SaveToFile(file); | 447 | terrainModule.SaveToFile(file); |
| 448 | 448 | ||
| 449 | responseData["success"] = false; | 449 | responseData["success"] = true; |
| 450 | 450 | ||
| 451 | m_log.Info("[RADMIN]: Save height maps request complete"); | 451 | m_log.Info("[RADMIN]: Save height maps request complete"); |
| 452 | } | 452 | } |
| @@ -1558,7 +1558,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 1558 | options["profile"] = (string)requestData["profile"]; | 1558 | options["profile"] = (string)requestData["profile"]; |
| 1559 | } | 1559 | } |
| 1560 | 1560 | ||
| 1561 | if (requestData["noassets"] == "true") | 1561 | if (requestData["noassets"].ToString() == "true") |
| 1562 | { | 1562 | { |
| 1563 | options["noassets"] = (string)requestData["noassets"] ; | 1563 | options["noassets"] = (string)requestData["noassets"] ; |
| 1564 | } | 1564 | } |