diff options
| author | Kitto Flora | 2010-09-06 21:45:17 +0000 |
|---|---|---|
| committer | Kitto Flora | 2010-09-06 21:45:17 +0000 |
| commit | cfaefad754642677dbddfcbe743c3fa5e058785d (patch) | |
| tree | 48ac26cc5289d8c0459837cd7d6936152216403b /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | Falling animation fix, comment out instrumentation. (diff) | |
| parent | Fix yet another cause of "Ghost attachments" (diff) | |
| download | opensim-SC_OLD-cfaefad754642677dbddfcbe743c3fa5e058785d.zip opensim-SC_OLD-cfaefad754642677dbddfcbe743c3fa5e058785d.tar.gz opensim-SC_OLD-cfaefad754642677dbddfcbe743c3fa5e058785d.tar.bz2 opensim-SC_OLD-cfaefad754642677dbddfcbe743c3fa5e058785d.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index c5994b2..1959427 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -278,7 +278,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 278 | 278 | ||
| 279 | if (!m_part.ParentGroup.Scene.RegionInfo.RegionSettings.DisableScripts) | 279 | if (!m_part.ParentGroup.Scene.RegionInfo.RegionSettings.DisableScripts) |
| 280 | { | 280 | { |
| 281 | if (stateSource == 1 && // Prim crossing | 281 | if (stateSource == 2 && // Prim crossing |
| 282 | m_part.ParentGroup.Scene.m_trustBinaries) | 282 | m_part.ParentGroup.Scene.m_trustBinaries) |
| 283 | { | 283 | { |
| 284 | m_items.LockItemsForWrite(true); | 284 | m_items.LockItemsForWrite(true); |
| @@ -1263,4 +1263,4 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1263 | Items.LockItemsForRead(false); | 1263 | Items.LockItemsForRead(false); |
| 1264 | } | 1264 | } |
| 1265 | } | 1265 | } |
| 1266 | } \ No newline at end of file | 1266 | } |