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.

1 files changed, 4 insertions, 5 deletions

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;
             }