aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
diff options
context:
space:
mode:
authorDiva Canto2010-01-10 15:35:15 -0800
committerDiva Canto2010-01-10 15:35:15 -0800
commitc0642bf7e06924397894229677235e2a841768bc (patch)
tree3d052597318fd29e107662ab29bb831ff8380582 /OpenSim/Region/DataSnapshot/EstateSnapshot.cs
parent* Changed IPresenceService Logout, so that it takes a position and a lookat (diff)
parentRemove all references to master avatar, replacing with estate owner where (diff)
downloadopensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.zip
opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.gz
opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.bz2
opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.xz
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region/DataSnapshot/EstateSnapshot.cs')
-rw-r--r--OpenSim/Region/DataSnapshot/EstateSnapshot.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
index 9206a6d..27c82cd 100644
--- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
@@ -56,9 +56,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
56 //Now in DataSnapshotProvider module form! 56 //Now in DataSnapshotProvider module form!
57 XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", ""); 57 XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", "");
58 58
59 UUID ownerid = m_scene.RegionInfo.MasterAvatarAssignedUUID; 59 ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner;
60 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
61 ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner;
62 60
63 UserAccount userInfo = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); 61 UserAccount userInfo = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid);
64 //TODO: Change to query userserver about the master avatar UUID ? 62 //TODO: Change to query userserver about the master avatar UUID ?