diff options
author | Justin Clark-Casey (justincc) | 2011-10-01 00:19:09 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-01 00:19:09 +0100 |
commit | a1875ec7600758087f6c06ccaf625507362e215c (patch) | |
tree | e92612313532a19b263011336bcad23418add1c5 /OpenSim | |
parent | minor: remove clutter null check from pass in config to AvatarFactoryModule.I... (diff) | |
download | opensim-SC_OLD-a1875ec7600758087f6c06ccaf625507362e215c.zip opensim-SC_OLD-a1875ec7600758087f6c06ccaf625507362e215c.tar.gz opensim-SC_OLD-a1875ec7600758087f6c06ccaf625507362e215c.tar.bz2 opensim-SC_OLD-a1875ec7600758087f6c06ccaf625507362e215c.tar.xz |
Add ability to pass in the permissions option (perm) to save oar via RemoteAdmin
Applies patch in http://opensimulator.org/mantis/view.php?id=5686
Thanks Michelle Argus!
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index e20b487..08f3dc7 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -2340,10 +2340,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2340 | /// <description>UUID of the region</description></item> | 2340 | /// <description>UUID of the region</description></item> |
2341 | /// <item><term>region_name</term> | 2341 | /// <item><term>region_name</term> |
2342 | /// <description>region name</description></item> | 2342 | /// <description>region name</description></item> |
2343 | /// <item><term>profile</term> | 2343 | /// <item><term>profile</term> |
2344 | /// <description>profile url</description></item> | 2344 | /// <description>profile url</description></item> |
2345 | /// <item><term>noassets</term> | 2345 | /// <item><term>noassets</term> |
2346 | /// <description>true if no assets should be saved</description></item> | 2346 | /// <description>true if no assets should be saved</description></item> |
2347 | /// <item><term>perm</term> | ||
2348 | /// <description>C and/or T</description></item> | ||
2347 | /// </list> | 2349 | /// </list> |
2348 | /// | 2350 | /// |
2349 | /// <code>region_uuid</code> takes precedence over | 2351 | /// <code>region_uuid</code> takes precedence over |
@@ -2418,6 +2420,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2418 | options["noassets"] = (string)requestData["noassets"] ; | 2420 | options["noassets"] = (string)requestData["noassets"] ; |
2419 | } | 2421 | } |
2420 | 2422 | ||
2423 | if (requestData.Contains("perm")) | ||
2424 | { | ||
2425 | options["checkPermissions"] = (string)requestData["perm"]; | ||
2426 | } | ||
2427 | |||
2421 | IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>(); | 2428 | IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>(); |
2422 | 2429 | ||
2423 | if (archiver != null) | 2430 | if (archiver != null) |