aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-20 19:25:52 -0400
committerTeravus Ovares (Dan Olivares)2009-08-20 19:25:52 -0400
commit181b992b4a8dab3423b52f705e20dcb63e7fdb47 (patch)
tree309f2255464873944a5478472596cbc24b130b27 /OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
parent* Deal with git thinking that file was changed even though it wasn't and it's... (diff)
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-181b992b4a8dab3423b52f705e20dcb63e7fdb47.zip
opensim-SC_OLD-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.gz
opensim-SC_OLD-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.bz2
opensim-SC_OLD-181b992b4a8dab3423b52f705e20dcb63e7fdb47.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 77b980c..d722e23 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -519,7 +519,7 @@ namespace OpenSim.Region.Framework.Scenes
519// m_log.DebugFormat( 519// m_log.DebugFormat(
520// "[AGENT INVENTORY]: Updating inventory folder {0} {1} for {2} {3}", folderID, name, remoteClient.Name, remoteClient.AgentId); 520// "[AGENT INVENTORY]: Updating inventory folder {0} {1} for {2} {3}", folderID, name, remoteClient.Name, remoteClient.AgentId);
521 521
522 InventoryFolderBase folder = new InventoryFolderBase(folderID); 522 InventoryFolderBase folder = new InventoryFolderBase(folderID, remoteClient.AgentId);
523 folder = InventoryService.GetFolder(folder); 523 folder = InventoryService.GetFolder(folder);
524 if (folder != null) 524 if (folder != null)
525 { 525 {