aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-15 18:36:22 +0100
committerJustin Clark-Casey (justincc)2011-09-15 18:36:22 +0100
commit8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce (patch)
treefd15f12b017722fdf496cdb909ab9c1933a1f538 /OpenSim/Region/Framework/Scenes
parentIf a prim inventory becomes empty through deletion, send an empty xfer file n... (diff)
downloadopensim-SC_OLD-8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce.zip
opensim-SC_OLD-8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce.tar.gz
opensim-SC_OLD-8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce.tar.bz2
opensim-SC_OLD-8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce.tar.xz
Shuffle order of code in invnetory connector GetFolderContent() calls to avoid a possible race condition
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 59ac30d..6085f1e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -875,7 +875,7 @@ namespace OpenSim.Region.Framework.Scenes
875// m_log.DebugFormat( 875// m_log.DebugFormat(
876// "[PRIM INVENTORY]: Not sending inventory data for part {0} {1} {2} for {3} since no items", 876// "[PRIM INVENTORY]: Not sending inventory data for part {0} {1} {2} for {3} since no items",
877// m_part.Name, m_part.LocalId, m_part.UUID, client.Name); 877// m_part.Name, m_part.LocalId, m_part.UUID, client.Name);
878 878
879 client.SendTaskInventory(m_part.UUID, 0, new byte[0]); 879 client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
880 return; 880 return;
881 } 881 }