diff options
author | Teravus Ovares | 2007-12-05 06:44:32 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-05 06:44:32 +0000 |
commit | bb824eadeeb2b35025954d0c97f15123c6fd0cbe (patch) | |
tree | afca518b8e5b806cd2e7ab7965d34765d4b18bc4 /OpenSim/Region/Environment/Scenes/InnerScene.cs | |
parent | fixed a few compiler warnings under mono (committed from a train, with adjohn... (diff) | |
download | opensim-SC_OLD-bb824eadeeb2b35025954d0c97f15123c6fd0cbe.zip opensim-SC_OLD-bb824eadeeb2b35025954d0c97f15123c6fd0cbe.tar.gz opensim-SC_OLD-bb824eadeeb2b35025954d0c97f15123c6fd0cbe.tar.bz2 opensim-SC_OLD-bb824eadeeb2b35025954d0c97f15123c6fd0cbe.tar.xz |
* Refactored Permissions into ScenePresence as requested by MW
* Un-hackerized generating the client_flags
* Now handling the ObjectPermissions Update packet
* Warning: Backup your prim before updating. If you fail to do so and something goes wrong then, All Yr prim are belong to us!
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 2511baf..4c168b3 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -555,7 +555,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
555 | 555 | ||
556 | public void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 pos, IClientAPI remoteClient) | 556 | public void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 pos, IClientAPI remoteClient) |
557 | { | 557 | { |
558 | if (PermissionsMngr.CanEditObject(remoteClient.AgentId, objectID)) | 558 | if (PermissionsMngr.CanEditObject(remoteClient.AgentId, objectID) || PermissionsMngr.AnyoneCanMovePermission(remoteClient.AgentId, objectID)) |
559 | { | 559 | { |
560 | SceneObjectGroup group = GetGroupByPrim(objectID); | 560 | SceneObjectGroup group = GetGroupByPrim(objectID); |
561 | if (group != null) | 561 | if (group != null) |
@@ -729,7 +729,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
729 | 729 | ||
730 | if (originPrim != null) | 730 | if (originPrim != null) |
731 | { | 731 | { |
732 | if (PermissionsMngr.CanCopyObject(AgentID, originPrim.UUID)) | 732 | if (PermissionsMngr.CanCopyObject(AgentID, originPrim.UUID) || PermissionsMngr.AnyoneCanCopyPermission(AgentID, originPrim.UUID)) |
733 | { | 733 | { |
734 | SceneObjectGroup copy = originPrim.Copy(AgentID, GroupID); | 734 | SceneObjectGroup copy = originPrim.Copy(AgentID, GroupID); |
735 | copy.AbsolutePosition = copy.AbsolutePosition + offset; | 735 | copy.AbsolutePosition = copy.AbsolutePosition + offset; |