From 328ab79b783d4beaa5f954918e3b306950153c1a Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 16 Aug 2008 02:00:36 +0000
Subject: Refactor a lot of direct calls to OGS1 to use the cached version
 instead. Scripts can now no longer DOS the user server and there are a lot
 fewer gratuitious lookups of user profile data.

---
 OpenSim/Region/Environment/Scenes/Scene.cs         | 17 -----------------
 OpenSim/Region/Environment/Scenes/ScenePresence.cs |  9 ++++-----
 2 files changed, 4 insertions(+), 22 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 00d8298..22251e9 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -3777,22 +3777,5 @@ 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 b22643f..8dcfc03 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2026,13 +2026,12 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (godStatus)
             {
-                // TODO: remove this cruft once the master avatar is fully
-                // deprecated. For now, assign god level 200 to anyone
+                // 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;
+                CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(agentID);
+                if(profile.UserProfile.GodLevel > 0)
+                    m_godlevel = profile.UserProfile.GodLevel;
                 else
                     m_godlevel = 200;
             }
-- 
cgit v1.1