1 files changed, 30 insertions, 22 deletions

diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 1533462..4652d70 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -32,7 +32,7 @@ using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
@@ -95,6 +95,23 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 
         protected Scene m_scene;
 
+        private InventoryFolderImpl m_libraryRootFolder;
+        protected InventoryFolderImpl LibraryRootFolder
+        {
+            get
+            {
+                if (m_libraryRootFolder != null)
+                    return m_libraryRootFolder;
+
+                ILibraryService lib = m_scene.RequestModuleInterface<ILibraryService>();
+                if (lib != null)
+                {
+                    m_libraryRootFolder = lib.LibraryRootFolder;
+                }
+                return m_libraryRootFolder;
+            }
+        }
+
         #region Constants
         // These are here for testing.  They will be taken out
 
@@ -462,12 +479,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         {
             if (user == UUID.Zero) return false;
         
-            if (m_scene.RegionInfo.MasterAvatarAssignedUUID != UUID.Zero)
-            {
-                if (m_RegionOwnerIsGod && (m_scene.RegionInfo.MasterAvatarAssignedUUID == user))
-                    return true;
-            }
-            
             if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
             {
                 if (m_scene.RegionInfo.EstateSettings.EstateOwner == user && m_RegionOwnerIsGod)
@@ -479,10 +490,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             if (m_allowGridGods)
             {
-                CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(user);
-                if (profile != null && profile.UserProfile != null)
+                UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, user);
+                if (account != null)
                 {
-                    if (profile.UserProfile.GodLevel >= 200)
+                    if (account.UserLevel >= 200)
                         return true;
                 }
             }
@@ -499,13 +510,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (m_friendsModule == null)
                 return false;
 
-            List<FriendListItem> profile = m_friendsModule.GetUserFriends(user);
+            uint friendPerms = m_friendsModule.GetFriendPerms(user, objectOwner);
+            if ((friendPerms & (uint)FriendRights.CanModifyObjects) != 0)
+                return true;
 
-            foreach (FriendListItem item in profile)
-            {
-                if (item.Friend == objectOwner && (item.FriendPerms & (uint)FriendRights.CanModifyObjects) != 0)
-                    return true;
-            }
             return false;
         }
 
@@ -1011,9 +1019,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 IInventoryService invService = m_scene.InventoryService;
                 InventoryItemBase assetRequestItem = new InventoryItemBase(notecard, user);
                 assetRequestItem = invService.GetItem(assetRequestItem);
-                if (assetRequestItem == null) // Library item
+                if (assetRequestItem == null && LibraryRootFolder != null) // Library item
                 {
-                    assetRequestItem = scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(notecard);
+                    assetRequestItem = LibraryRootFolder.FindItem(notecard);
 
                     if (assetRequestItem != null) // Implicitly readable
                         return true;
@@ -1431,9 +1439,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 IInventoryService invService = m_scene.InventoryService;
                 InventoryItemBase assetRequestItem = new InventoryItemBase(script, user);
                 assetRequestItem = invService.GetItem(assetRequestItem);
-                if (assetRequestItem == null) // Library item
+                if (assetRequestItem == null && LibraryRootFolder != null) // Library item
                 {
-                    assetRequestItem = m_scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(script);
+                    assetRequestItem = LibraryRootFolder.FindItem(script);
 
                     if (assetRequestItem != null) // Implicitly readable
                         return true;
@@ -1526,9 +1534,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 IInventoryService invService = m_scene.InventoryService;
                 InventoryItemBase assetRequestItem = new InventoryItemBase(notecard, user);
                 assetRequestItem = invService.GetItem(assetRequestItem);
-                if (assetRequestItem == null) // Library item
+                if (assetRequestItem == null && LibraryRootFolder != null) // Library item
                 {
-                    assetRequestItem = m_scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(notecard);
+                    assetRequestItem = LibraryRootFolder.FindItem(notecard);
 
                     if (assetRequestItem != null) // Implicitly readable
                         return true;