diff options
author | Melanie Thielker | 2008-08-15 13:13:39 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-08-15 13:13:39 +0000 |
commit | dfc553d0a4c25d6c1f491b228e89402c0415acda (patch) | |
tree | 63653f47cc17365ec828f2e5507b7fd75c0388be /OpenSim/Region/ClientStack | |
parent | Minor formatting cleanup. (diff) | |
download | opensim-SC_OLD-dfc553d0a4c25d6c1f491b228e89402c0415acda.zip opensim-SC_OLD-dfc553d0a4c25d6c1f491b228e89402c0415acda.tar.gz opensim-SC_OLD-dfc553d0a4c25d6c1f491b228e89402c0415acda.tar.bz2 opensim-SC_OLD-dfc553d0a4c25d6c1f491b228e89402c0415acda.tar.xz |
Fix up master avatar handling for estate owners. Introduces a new
hierarchical rights structure. MasterAvatar: Owner of the region server
(may be null), net gods (users with GodLevel 200), Estate owner
(from database). Look at Opensim.ini.example to enable net gods.
Estate owner will default to master avatar.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 74f4d44..212567f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2693,7 +2693,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2693 | 2693 | ||
2694 | //Sending Estate Settings | 2694 | //Sending Estate Settings |
2695 | returnblock[0].Parameter = Helpers.StringToField(estateName); | 2695 | returnblock[0].Parameter = Helpers.StringToField(estateName); |
2696 | returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString()); | 2696 | // TODO: remove this cruft once MasterAvatar is fully deprecated |
2697 | // | ||
2698 | if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) | ||
2699 | returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.EstateOwner.ToString()); | ||
2700 | else | ||
2701 | returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString()); | ||
2697 | returnblock[2].Parameter = Helpers.StringToField(estateID.ToString()); | 2702 | returnblock[2].Parameter = Helpers.StringToField(estateID.ToString()); |
2698 | 2703 | ||
2699 | returnblock[3].Parameter = Helpers.StringToField(estateFlags.ToString()); | 2704 | returnblock[3].Parameter = Helpers.StringToField(estateFlags.ToString()); |
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 3e941cf..7a552a6 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -135,11 +135,14 @@ namespace OpenSim.Region.ClientStack | |||
135 | scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); | 135 | scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); |
136 | scene.PhysicsScene.SetWaterLevel((float)regionInfo.RegionSettings.WaterHeight); | 136 | scene.PhysicsScene.SetWaterLevel((float)regionInfo.RegionSettings.WaterHeight); |
137 | 137 | ||
138 | // TODO: Remove this cruft once MasterAvatar is fully deprecated | ||
138 | //Master Avatar Setup | 139 | //Master Avatar Setup |
139 | UserProfileData masterAvatar; | 140 | UserProfileData masterAvatar; |
140 | if (scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) | 141 | if (scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) |
141 | { | 142 | { |
142 | masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID); | 143 | masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID); |
144 | scene.RegionInfo.MasterAvatarFirstName = masterAvatar.FirstName; | ||
145 | scene.RegionInfo.MasterAvatarLastName = masterAvatar.SurName; | ||
143 | } | 146 | } |
144 | else | 147 | else |
145 | { | 148 | { |
@@ -151,7 +154,7 @@ namespace OpenSim.Region.ClientStack | |||
151 | 154 | ||
152 | if (masterAvatar != null) | 155 | if (masterAvatar != null) |
153 | { | 156 | { |
154 | m_log.Info("[PARCEL]: Found master avatar [" + masterAvatar.ID.ToString() + "]"); | 157 | m_log.InfoFormat("[PARCEL]: Found master avatar {0} {1} [" + masterAvatar.ID.ToString() + "]", scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName); |
155 | scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID; | 158 | scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID; |
156 | } | 159 | } |
157 | else | 160 | else |