diff options
author | Justin Clark-Casey (justincc) | 2011-09-15 18:36:22 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-15 18:36:22 +0100 |
commit | 8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce (patch) | |
tree | fd15f12b017722fdf496cdb909ab9c1933a1f538 /OpenSim/Region/Framework | |
parent | If a prim inventory becomes empty through deletion, send an empty xfer file n... (diff) | |
download | opensim-SC-8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce.zip opensim-SC-8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce.tar.gz opensim-SC-8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce.tar.bz2 opensim-SC-8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce.tar.xz |
Shuffle order of code in invnetory connector GetFolderContent() calls to avoid a possible race condition
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 |
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 | } |