aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authordiva2008-12-15 20:45:40 +0000
committerdiva2008-12-15 20:45:40 +0000
commit8fffdac7fa724c651935acb46725bc101cf8dfee (patch)
tree21f44f4f921d00a0b1b9a65f3e1e53b5f1a396b3 /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
parent* minor: method documentation and miscellaneous tidy (diff)
downloadopensim-SC-8fffdac7fa724c651935acb46725bc101cf8dfee.zip
opensim-SC-8fffdac7fa724c651935acb46725bc101cf8dfee.tar.gz
opensim-SC-8fffdac7fa724c651935acb46725bc101cf8dfee.tar.bz2
opensim-SC-8fffdac7fa724c651935acb46725bc101cf8dfee.tar.xz
Attempt at restoring inventory access after TPs/crossings. RemoveClient in Scene was being too
aggressive at nixing the user out of the cache. We're now relying on NeedSceneCacheClear to decide whether to nix it or not. All other mods in other files are for better debugging messages.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs6
1 files changed, 5 insertions, 1 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 }