aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
2 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index c98c4f3..7c518c4 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -2106,7 +2106,7 @@ namespace OpenSim.Region.Environment.Scenes
2106 string xmlData = Utils.BytesToString(rezAsset.Data); 2106 string xmlData = Utils.BytesToString(rezAsset.Data);
2107 SceneObjectGroup group = new SceneObjectGroup(xmlData, true); 2107 SceneObjectGroup group = new SceneObjectGroup(xmlData, true);
2108 if (!Permissions.CanRezObject( 2108 if (!Permissions.CanRezObject(
2109 group.Children.Count, remoteClient.AgentId, pos) 2109 group.Children.Count, remoteClient.AgentId, pos)
2110 && !attachment) 2110 && !attachment)
2111 { 2111 {
2112 return null; 2112 return null;
@@ -2226,7 +2226,11 @@ namespace OpenSim.Region.Environment.Scenes
2226 } 2226 }
2227 } 2227 }
2228 } 2228 }
2229 else
2230 m_log.WarnFormat("[AGENT INVENTORY]: Root folder not found in {0}", RegionInfo.RegionName);
2229 } 2231 }
2232 else
2233 m_log.WarnFormat("[AGENT INVENTORY]: User profile not found in {0}", RegionInfo.RegionName);
2230 2234
2231 return null; 2235 return null;
2232 } 2236 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 873662e..f6d82c4 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2709,7 +2709,11 @@ namespace OpenSim.Region.Environment.Scenes
2709 m_sceneGraph.removeUserCount(!childagentYN); 2709 m_sceneGraph.removeUserCount(!childagentYN);
2710 RemoveCapsHandler(agentID); 2710 RemoveCapsHandler(agentID);
2711 2711
2712 CommsManager.UserProfileCacheService.RemoveUser(agentID); 2712 if (avatar.Scene.NeedSceneCacheClear(avatar.UUID))
2713 {
2714 m_log.InfoFormat("[SCENE]: User {0} is going to another region, profile cache removed in {1}", avatar.UUID, RegionInfo.RegionName);
2715 CommsManager.UserProfileCacheService.RemoveUser(agentID);
2716 }
2713 2717
2714 if (!avatar.IsChildAgent) 2718 if (!avatar.IsChildAgent)
2715 { 2719 {