OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.)

link-sitting
Oren Hurvitz 2013-09-16 13:31:48 +03:00 committed by Justin Clark-Casey (justincc)
parent 1bd89ac287
commit 0094971186
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
View File

@ -244,25 +244,20 @@ namespace OpenSim.Region.Framework.Scenes
if (part.ParentGroup.RootPart.LocalId != part.LocalId) if (part.ParentGroup.RootPart.LocalId != part.LocalId)
return; return;
bool isAttachment = false;
// This is wrong, wrong, wrong. Selection should not be // This is wrong, wrong, wrong. Selection should not be
// handled by group, but by prim. Legacy cruft. // handled by group, but by prim. Legacy cruft.
// TODO: Make selection flagging per prim! // TODO: Make selection flagging per prim!
// //
part.ParentGroup.IsSelected = false; part.ParentGroup.IsSelected = false;
if (part.ParentGroup.IsAttachment) part.ParentGroup.ScheduleGroupForFullUpdate();
isAttachment = true;
else
part.ParentGroup.ScheduleGroupForFullUpdate();
// If it's not an attachment, and we are allowed to move it, // If it's not an attachment, and we are allowed to move it,
// then we might have done so. If we moved across a parcel // then we might have done so. If we moved across a parcel
// boundary, we will need to recount prims on the parcels. // boundary, we will need to recount prims on the parcels.
// For attachments, that makes no sense. // For attachments, that makes no sense.
// //
if (!isAttachment) if (!part.ParentGroup.IsAttachment)
{ {
if (Permissions.CanEditObject( if (Permissions.CanEditObject(
part.UUID, remoteClient.AgentId) part.UUID, remoteClient.AgentId)

3
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -2700,7 +2700,8 @@ namespace OpenSim.Region.Framework.Scenes
return; return;
// This was pulled from SceneViewer. Attachments always receive full updates. // This was pulled from SceneViewer. Attachments always receive full updates.
// I could not verify if this is a requirement but this maintains existing behavior // This is needed because otherwise if only the root prim changes position, then
// it looks as if the entire object has moved (including the other prims).
if (ParentGroup.IsAttachment) if (ParentGroup.IsAttachment)
{ {
ScheduleFullUpdate(); ScheduleFullUpdate();