diff options
author | UbitUmarov | 2017-01-17 23:22:02 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-17 23:22:02 +0000 |
commit | 6d784f63060940bd82a2be776385abd40901f57c (patch) | |
tree | c4d98d5348737d6282408b8d88fc9c66ea082ca0 /OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |
parent | Permissions module: add GetObjectPermissions() that should replace GenericObj... (diff) | |
download | opensim-SC-6d784f63060940bd82a2be776385abd40901f57c.zip opensim-SC-6d784f63060940bd82a2be776385abd40901f57c.tar.gz opensim-SC-6d784f63060940bd82a2be776385abd40901f57c.tar.bz2 opensim-SC-6d784f63060940bd82a2be776385abd40901f57c.tar.xz |
Permissions module: GenerateClientFlags() no need to keep looking for the same part several times; fix locked mask in GetObjectPermissions()
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index e611897..f2d853d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -183,7 +183,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
183 | part.SendFullUpdate(remoteClient); | 183 | part.SendFullUpdate(remoteClient); |
184 | 184 | ||
185 | // A prim is only tainted if it's allowed to be edited by the person clicking it. | 185 | // A prim is only tainted if it's allowed to be edited by the person clicking it. |
186 | if (Permissions.CanChangeSelectedState(sog.UUID, (ScenePresence)remoteClient.SceneAgent)) | 186 | if (Permissions.CanChangeSelectedState(part, (ScenePresence)remoteClient.SceneAgent)) |
187 | { | 187 | { |
188 | part.IsSelected = true; | 188 | part.IsSelected = true; |
189 | EventManager.TriggerParcelPrimCountTainted(); | 189 | EventManager.TriggerParcelPrimCountTainted(); |
@@ -249,7 +249,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
249 | // handled by group, but by prim. Legacy cruft. | 249 | // handled by group, but by prim. Legacy cruft. |
250 | // TODO: Make selection flagging per prim! | 250 | // TODO: Make selection flagging per prim! |
251 | // | 251 | // |
252 | if (Permissions.CanChangeSelectedState(part.ParentGroup.UUID, (ScenePresence)remoteClient.SceneAgent)) | 252 | if (Permissions.CanChangeSelectedState(part, (ScenePresence)remoteClient.SceneAgent)) |
253 | { | 253 | { |
254 | part.IsSelected = false; | 254 | part.IsSelected = false; |
255 | if (!part.ParentGroup.IsAttachment && oldgprSelect != part.ParentGroup.IsSelected) | 255 | if (!part.ParentGroup.IsAttachment && oldgprSelect != part.ParentGroup.IsSelected) |