Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmerge

avinationmerge
Melanie 2011-10-11 23:15:29 +01:00
commit 95a1a804bf
1 changed files with 8 additions and 1 deletions

View File

@ -2443,10 +2443,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
/// <description>UUID of the region</description></item>
/// <item><term>region_name</term>
/// <description>region name</description></item>
/// <item><term>profile</term>
/// <item><term>profile</term>
/// <description>profile url</description></item>
/// <item><term>noassets</term>
/// <description>true if no assets should be saved</description></item>
/// <item><term>perm</term>
/// <description>C and/or T</description></item>
/// </list>
///
/// <code>region_uuid</code> takes precedence over
@ -2521,6 +2523,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
options["noassets"] = (string)requestData["noassets"] ;
}
if (requestData.Contains("perm"))
{
options["checkPermissions"] = (string)requestData["perm"];
}
IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>();
if (archiver != null)