diff options
author | UbitUmarov | 2015-10-27 01:17:32 +0000 |
---|---|---|
committer | UbitUmarov | 2015-10-27 01:17:32 +0000 |
commit | 9e6d9e0436eb6c9c37c9f98f2689c2757cbfe4c5 (patch) | |
tree | 966494cc4e4c192e27052608533115083e1302fd /OpenSim/Region/Framework/Scenes | |
parent | Make changes to a friend rights reach him on another sim; find on map does sh... (diff) | |
download | opensim-SC-9e6d9e0436eb6c9c37c9f98f2689c2757cbfe4c5.zip opensim-SC-9e6d9e0436eb6c9c37c9f98f2689c2757cbfe4c5.tar.gz opensim-SC-9e6d9e0436eb6c9c37c9f98f2689c2757cbfe4c5.tar.bz2 opensim-SC-9e6d9e0436eb6c9c37c9f98f2689c2757cbfe4c5.tar.xz |
friends rights to edit objects display on viewers fixed. This needs to be optimized in future
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 0b0e458..34b9c5f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -201,6 +201,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
201 | 201 | ||
202 | part.SendPropertiesToClient(remoteClient); | 202 | part.SendPropertiesToClient(remoteClient); |
203 | 203 | ||
204 | // waste of time because properties do not send prim flags as they should | ||
205 | // if a friend got or lost edit rights after login, a full update is needed | ||
206 | if(sog.OwnerID != remoteClient.AgentId) | ||
207 | part.SendFullUpdate(remoteClient); | ||
208 | |||
204 | // A prim is only tainted if it's allowed to be edited by the person clicking it. | 209 | // A prim is only tainted if it's allowed to be edited by the person clicking it. |
205 | if (Permissions.CanEditObject(sog.UUID, remoteClient.AgentId) | 210 | if (Permissions.CanEditObject(sog.UUID, remoteClient.AgentId) |
206 | || Permissions.CanMoveObject(sog.UUID, remoteClient.AgentId)) | 211 | || Permissions.CanMoveObject(sog.UUID, remoteClient.AgentId)) |
@@ -303,12 +308,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
303 | part.IsSelected = false; | 308 | part.IsSelected = false; |
304 | if (!part.ParentGroup.IsAttachment && oldgprSelect != part.ParentGroup.IsSelected) | 309 | if (!part.ParentGroup.IsAttachment && oldgprSelect != part.ParentGroup.IsSelected) |
305 | EventManager.TriggerParcelPrimCountTainted(); | 310 | EventManager.TriggerParcelPrimCountTainted(); |
306 | } | ||
307 | |||
308 | // restore targetOmega | ||
309 | if (part.AngularVelocity != Vector3.Zero) | ||
310 | part.ScheduleTerseUpdate(); | ||
311 | 311 | ||
312 | // restore targetOmega | ||
313 | if (part.AngularVelocity != Vector3.Zero) | ||
314 | part.ScheduleTerseUpdate(); | ||
315 | } | ||
312 | } | 316 | } |
313 | 317 | ||
314 | public virtual void ProcessMoneyTransferRequest(UUID source, UUID destination, int amount, | 318 | public virtual void ProcessMoneyTransferRequest(UUID source, UUID destination, int amount, |