aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-15 19:28:10 +0000
committerTeravus Ovares2008-05-15 19:28:10 +0000
commitd60e4574633e50d257730cc582a6efb63c8e9d7b (patch)
tree3c51a5db9284eec4a29962a877e4c2f9dd0fc51a /OpenSim/Region/Environment/Scenes/InnerScene.cs
parentremove my UserAppearance object, switch all code to use (diff)
downloadopensim-SC-d60e4574633e50d257730cc582a6efb63c8e9d7b.zip
opensim-SC-d60e4574633e50d257730cc582a6efb63c8e9d7b.tar.gz
opensim-SC-d60e4574633e50d257730cc582a6efb63c8e9d7b.tar.bz2
opensim-SC-d60e4574633e50d257730cc582a6efb63c8e9d7b.tar.xz
Committing patch from Melanie. 0001290: [PATCH] implement permissions propagation and script module hooks. Thanks Melanie!
* Implements quite a few inventory related perms. * (from Teravus) Fixes Take Copy
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 6d00f71..aa22740 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1339,11 +1339,11 @@ namespace OpenSim.Region.Environment.Scenes
1339 1339
1340 if (IncludeInSearch && m_parentScene.ExternalChecks.ExternalChecksCanEditObject(objid, user)) 1340 if (IncludeInSearch && m_parentScene.ExternalChecks.ExternalChecksCanEditObject(objid, user))
1341 { 1341 {
1342 obj.AddFlag(LLObject.ObjectFlags.JointWheel); 1342 obj.ParentGroup.RootPart.AddFlag(LLObject.ObjectFlags.JointWheel);
1343 } 1343 }
1344 else if (!IncludeInSearch && m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(objid,user)) 1344 else if (!IncludeInSearch && m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(objid,user))
1345 { 1345 {
1346 obj.RemFlag(LLObject.ObjectFlags.JointWheel); 1346 obj.ParentGroup.RootPart.RemFlag(LLObject.ObjectFlags.JointWheel);
1347 } 1347 }
1348 } 1348 }
1349 1349