aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMatt Lehmann2014-05-02 18:00:34 -0700
committerJustin Clark-Casey (justincc)2014-05-06 18:48:59 +0100
commit9e83b430092be363d87c829955f7d266ed996598 (patch)
treea7b0ae0c1b7bca72d8843c92aa227e889f6cc424 /OpenSim
parentupdated version of default user switch for load oar :q :q (diff)
downloadopensim-SC_OLD-9e83b430092be363d87c829955f7d266ed996598.zip
opensim-SC_OLD-9e83b430092be363d87c829955f7d266ed996598.tar.gz
opensim-SC_OLD-9e83b430092be363d87c829955f7d266ed996598.tar.bz2
opensim-SC_OLD-9e83b430092be363d87c829955f7d266ed996598.tar.xz
new version of patch to add default-user switch new version :qw :wq updated version of default user switch for load oar :q :q
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index fe87350..e9c6fb6 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -218,6 +218,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
218 m_merge = options.ContainsKey("merge"); 218 m_merge = options.ContainsKey("merge");
219 m_requestId = requestId; 219 m_requestId = requestId;
220 220
221 m_defaultUser = scene.RegionInfo.EstateSettings.EstateOwner;
222
221 // Zero can never be a valid user id 223 // Zero can never be a valid user id
222 m_validUserUuids[UUID.Zero] = false; 224 m_validUserUuids[UUID.Zero] = false;
223 225