diff options
author | Oren Hurvitz | 2013-09-16 13:31:48 +0300 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-10-17 23:10:16 +0100 |
commit | 0094971186b7ba96df454acdf221f702bc214be5 (patch) | |
tree | 4f92f9199485b52ddd61e139b22a813827126727 /OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |
parent | Readding Mono.Security.dll. This comes from http://pgfoundry.org/frs/downloa... (diff) | |
download | opensim-SC_OLD-0094971186b7ba96df454acdf221f702bc214be5.zip opensim-SC_OLD-0094971186b7ba96df454acdf221f702bc214be5.tar.gz opensim-SC_OLD-0094971186b7ba96df454acdf221f702bc214be5.tar.bz2 opensim-SC_OLD-0094971186b7ba96df454acdf221f702bc214be5.tar.xz |
After finishing to edit an attachment, let other avatars see the changes. (The changes weren't visible before because updates to attachments aren't sent while the attachment is selected.)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 998c19e..cddf818 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -244,25 +244,20 @@ namespace OpenSim.Region.Framework.Scenes | |||
244 | if (part.ParentGroup.RootPart.LocalId != part.LocalId) | 244 | if (part.ParentGroup.RootPart.LocalId != part.LocalId) |
245 | return; | 245 | return; |
246 | 246 | ||
247 | bool isAttachment = false; | ||
248 | |||
249 | // This is wrong, wrong, wrong. Selection should not be | 247 | // This is wrong, wrong, wrong. Selection should not be |
250 | // handled by group, but by prim. Legacy cruft. | 248 | // handled by group, but by prim. Legacy cruft. |
251 | // TODO: Make selection flagging per prim! | 249 | // TODO: Make selection flagging per prim! |
252 | // | 250 | // |
253 | part.ParentGroup.IsSelected = false; | 251 | part.ParentGroup.IsSelected = false; |
254 | 252 | ||
255 | if (part.ParentGroup.IsAttachment) | 253 | part.ParentGroup.ScheduleGroupForFullUpdate(); |
256 | isAttachment = true; | ||
257 | else | ||
258 | part.ParentGroup.ScheduleGroupForFullUpdate(); | ||
259 | 254 | ||
260 | // If it's not an attachment, and we are allowed to move it, | 255 | // If it's not an attachment, and we are allowed to move it, |
261 | // then we might have done so. If we moved across a parcel | 256 | // then we might have done so. If we moved across a parcel |
262 | // boundary, we will need to recount prims on the parcels. | 257 | // boundary, we will need to recount prims on the parcels. |
263 | // For attachments, that makes no sense. | 258 | // For attachments, that makes no sense. |
264 | // | 259 | // |
265 | if (!isAttachment) | 260 | if (!part.ParentGroup.IsAttachment) |
266 | { | 261 | { |
267 | if (Permissions.CanEditObject( | 262 | if (Permissions.CanEditObject( |
268 | part.UUID, remoteClient.AgentId) | 263 | part.UUID, remoteClient.AgentId) |