diff options
| author | Justin Clark-Casey (justincc) | 2010-09-03 21:14:23 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-03 21:14:23 +0100 |
| commit | 71c0fc10df085921ef92287c754a5bffe40ddc05 (patch) | |
| tree | 51ddd9b1a4531215d9ad813b323bbbed8a1c8acd /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | llRot2Euler Tests (diff) | |
| parent | Last+2 tweak (diff) | |
| download | opensim-SC-71c0fc10df085921ef92287c754a5bffe40ddc05.zip opensim-SC-71c0fc10df085921ef92287c754a5bffe40ddc05.tar.gz opensim-SC-71c0fc10df085921ef92287c754a5bffe40ddc05.tar.bz2 opensim-SC-71c0fc10df085921ef92287c754a5bffe40ddc05.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 d7767bd..ca089a1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -252,7 +252,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 252 | 252 | ||
| 253 | if (!m_part.ParentGroup.Scene.RegionInfo.RegionSettings.DisableScripts) | 253 | if (!m_part.ParentGroup.Scene.RegionInfo.RegionSettings.DisableScripts) |
| 254 | { | 254 | { |
| 255 | if (stateSource == 1 && // Prim crossing | 255 | if (stateSource == 2 && // Prim crossing |
| 256 | m_part.ParentGroup.Scene.m_trustBinaries) | 256 | m_part.ParentGroup.Scene.m_trustBinaries) |
| 257 | { | 257 | { |
| 258 | lock (m_items) | 258 | lock (m_items) |
| @@ -1095,4 +1095,4 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1095 | } | 1095 | } |
| 1096 | } | 1096 | } |
| 1097 | } | 1097 | } |
| 1098 | } \ No newline at end of file | 1098 | } |