aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
diff options
context:
space:
mode:
authorRobert Adams2013-10-28 09:30:26 -0700
committerRobert Adams2013-10-28 09:30:26 -0700
commit2be0347f5044ec723748c53db9290f3cf8bc431a (patch)
treeb52812ac7fcdcd8a7a985094e14ca3d461a39673 /OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
parentvarregion: update PGSQL driver for storing variable terrain size blobs. (diff)
parentBulletSim: restore collision flags when clear collision cache. (diff)
downloadopensim-SC-2be0347f5044ec723748c53db9290f3cf8bc431a.zip
opensim-SC-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.gz
opensim-SC-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.bz2
opensim-SC-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs9
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)