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.

3 files changed, 28 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index ca77f2b..3f62610 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -116,6 +116,8 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     userlevel = 1;
                 }
+                // TODO: remove this cruft once MasterAvatar is fully deprecated
+                //
                 if (m_regInfo.MasterAvatarAssignedUUID == AgentID)
                 {
                     userlevel = 2;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 22251e9..00d8298 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -3777,5 +3777,22 @@ namespace OpenSim.Region.Environment.Scenes
             //Console.WriteLine("Terrain packet unacked, resending patch: " + patchX + " , " + patchY);
              client.SendLayerData(patchX, patchY, Heightmap.GetFloatsSerialised());
         }
+
+//        public bool IsAdministrator(LLUUID user)
+//        {
+//            if(RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
+//            {
+//                if(RegionInfo.MasterAvatarAssignedUUID == user)
+//                    return true;
+//            }
+//
+//            UserProfileData userProfile =
+//                    CommsManager.UserService.GetUserProfile(user);
+//
+//            if(userProfile.GodLevel >= 200)
+//                return true;
+//
+//            return false;
+//        }
     }
 }              
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index d8d534e..b4cf70a 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2017,7 +2017,15 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (godStatus)
             {
-                m_godlevel = 250;
+                // TODO: remove this cruft once the master avatar is fully
+                // deprecated. For now, assign god level 200 to anyone
+                // who is granted god powers, but has no god level set.
+                //
+                UserProfileData userProfile = m_scene.CommsManager.UserService.GetUserProfile(agentID);
+                if(userProfile.GodLevel > 0)
+                    m_godlevel = userProfile.GodLevel;
+                else
+                    m_godlevel = 200;
             }
             else
             {