aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2010-09-03 03:16:08 +0200
committerMelanie2010-09-03 03:27:26 +0100
commit17a26c3701f7e8de8a4fc223c2069798223b245d (patch)
tree8d4496407c854ebce90f82ea8b0bb5dd6f6a57a0 /OpenSim/Region/Framework
parentRemove commented code and the comment, as the change has proven out (diff)
downloadopensim-SC_OLD-17a26c3701f7e8de8a4fc223c2069798223b245d.zip
opensim-SC_OLD-17a26c3701f7e8de8a4fc223c2069798223b245d.tar.gz
opensim-SC_OLD-17a26c3701f7e8de8a4fc223c2069798223b245d.tar.bz2
opensim-SC_OLD-17a26c3701f7e8de8a4fc223c2069798223b245d.tar.xz
Fix an issue with rezzing scripted objects.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs4
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}