diff options
| author | John Hurliman | 2010-09-03 13:36:59 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-09-03 13:36:59 -0700 |
| commit | aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34 (patch) | |
| tree | 30af81e23062b91bd333af5484443ad703f118e5 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | * Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors to... (diff) | |
| parent | minor: remove mono compiler warnings (diff) | |
| download | opensim-SC_OLD-aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34.zip opensim-SC_OLD-aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34.tar.gz opensim-SC_OLD-aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34.tar.bz2 opensim-SC_OLD-aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34.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 | } |