aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-10-11 23:15:29 +0100
committerMelanie2011-10-11 23:15:29 +0100
commit95a1a804bf4ebc2b821760ae38db32cd7c70d86d (patch)
tree0484c0094aa1bb4ed7326e43c498a2715e70cabf
parentMerge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge (diff)
parentAdd ability to pass in the permissions option (perm) to save oar via RemoteAdmin (diff)
downloadopensim-SC-95a1a804bf4ebc2b821760ae38db32cd7c70d86d.zip
opensim-SC-95a1a804bf4ebc2b821760ae38db32cd7c70d86d.tar.gz
opensim-SC-95a1a804bf4ebc2b821760ae38db32cd7c70d86d.tar.bz2
opensim-SC-95a1a804bf4ebc2b821760ae38db32cd7c70d86d.tar.xz
Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmerge
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index b190a3d..535712e 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -2443,10 +2443,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2443 /// <description>UUID of the region</description></item> 2443 /// <description>UUID of the region</description></item>
2444 /// <item><term>region_name</term> 2444 /// <item><term>region_name</term>
2445 /// <description>region name</description></item> 2445 /// <description>region name</description></item>
2446 /// <item><term>profile</term> 2446 /// <item><term>profile</term>
2447 /// <description>profile url</description></item> 2447 /// <description>profile url</description></item>
2448 /// <item><term>noassets</term> 2448 /// <item><term>noassets</term>
2449 /// <description>true if no assets should be saved</description></item> 2449 /// <description>true if no assets should be saved</description></item>
2450 /// <item><term>perm</term>
2451 /// <description>C and/or T</description></item>
2450 /// </list> 2452 /// </list>
2451 /// 2453 ///
2452 /// <code>region_uuid</code> takes precedence over 2454 /// <code>region_uuid</code> takes precedence over
@@ -2521,6 +2523,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2521 options["noassets"] = (string)requestData["noassets"] ; 2523 options["noassets"] = (string)requestData["noassets"] ;
2522 } 2524 }
2523 2525
2526 if (requestData.Contains("perm"))
2527 {
2528 options["checkPermissions"] = (string)requestData["perm"];
2529 }
2530
2524 IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>(); 2531 IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>();
2525 2532
2526 if (archiver != null) 2533 if (archiver != null)