diff options
| author | UbitUmarov | 2017-05-04 12:57:11 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-04 12:57:11 +0100 |
| commit | 5f5b7e56dbff9acbd57506db852160761613556e (patch) | |
| tree | a2de12fc323878ad393d952fa2ab7cc3a5d55a9c /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | viewer can't tell if a taskitem is group owned if we don't tell him; (diff) | |
| parent | the new options i add where actually bad idea, they would make the (diff) | |
| download | opensim-SC-5f5b7e56dbff9acbd57506db852160761613556e.zip opensim-SC-5f5b7e56dbff9acbd57506db852160761613556e.tar.gz opensim-SC-5f5b7e56dbff9acbd57506db852160761613556e.tar.bz2 opensim-SC-5f5b7e56dbff9acbd57506db852160761613556e.tar.xz | |
merge fix
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index f948336..d980fe5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -4460,8 +4460,11 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter | |||
| 4460 | if (god) | 4460 | if (god) |
| 4461 | baseMask = 0x7ffffff0; | 4461 | baseMask = 0x7ffffff0; |
| 4462 | 4462 | ||
| 4463 | // Are we the owner? | 4463 | bool canChange = (AgentID == OwnerID) || god; |
| 4464 | if ((AgentID == OwnerID) || god) | 4464 | if(!canChange) |
| 4465 | canChange = ParentGroup.Scene.Permissions.CanEditObjectPermissions(ParentGroup, AgentID); | ||
| 4466 | |||
| 4467 | if (canChange) | ||
| 4465 | { | 4468 | { |
| 4466 | switch (field) | 4469 | switch (field) |
| 4467 | { | 4470 | { |