aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController
diff options
context:
space:
mode:
authorMelanie2012-09-16 04:11:20 +0100
committerMelanie2012-09-16 04:11:20 +0100
commitdb774d4292588db1e2ac4a9fafe977ddbec353ee (patch)
tree5fc381d7cb96cc0d2b47e4807821f488c339ec13 /OpenSim/ApplicationPlugins/RemoteController
parentMerge branch 'avination' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.zip
opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.gz
opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.bz2
opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 437d150..202d199 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1493,6 +1493,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1493 /// <description>profile url</description></item> 1493 /// <description>profile url</description></item>
1494 /// <item><term>noassets</term> 1494 /// <item><term>noassets</term>
1495 /// <description>true if no assets should be saved</description></item> 1495 /// <description>true if no assets should be saved</description></item>
1496 /// <item><term>all</term>
1497 /// <description>true to save all the regions in the simulator</description></item>
1496 /// <item><term>perm</term> 1498 /// <item><term>perm</term>
1497 /// <description>C and/or T</description></item> 1499 /// <description>C and/or T</description></item>
1498 /// </list> 1500 /// </list>
@@ -1549,6 +1551,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1549 options["checkPermissions"] = (string)requestData["perm"]; 1551 options["checkPermissions"] = (string)requestData["perm"];
1550 } 1552 }
1551 1553
1554 if ((string)requestData["all"] == "true")
1555 {
1556 options["all"] = (string)requestData["all"];
1557 }
1558
1552 IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>(); 1559 IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>();
1553 1560
1554 if (archiver != null) 1561 if (archiver != null)