diff options
author | Melanie | 2010-11-16 21:01:56 +0000 |
---|---|---|
committer | Melanie | 2010-11-16 21:01:56 +0000 |
commit | 7bb005b0d1a5ae63ca94a3a3f8ad98e0388ea76b (patch) | |
tree | b73a2aa9f04e9c34281fb38512da3eb800396769 /OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |
parent | Fix osTeleportAgent for hypergrid destinations. (diff) | |
download | opensim-SC_OLD-7bb005b0d1a5ae63ca94a3a3f8ad98e0388ea76b.zip opensim-SC_OLD-7bb005b0d1a5ae63ca94a3a3f8ad98e0388ea76b.tar.gz opensim-SC_OLD-7bb005b0d1a5ae63ca94a3a3f8ad98e0388ea76b.tar.bz2 opensim-SC_OLD-7bb005b0d1a5ae63ca94a3a3f8ad98e0388ea76b.tar.xz |
Change the way attachments are persisted. Editing a worn attachment will now
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 7a175ea..ef21834 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -569,12 +569,20 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
569 | { | 569 | { |
570 | group.RootPart.Flags |= PrimFlags.Phantom; | 570 | group.RootPart.Flags |= PrimFlags.Phantom; |
571 | group.RootPart.IsAttachment = true; | 571 | group.RootPart.IsAttachment = true; |
572 | } | ||
573 | 572 | ||
574 | // If we're rezzing an attachment then don't ask AddNewSceneObject() to update the client since | 573 | // If we're rezzing an attachment then don't ask |
575 | // we'll be doing that later on. Scheduling more than one full update during the attachment | 574 | // AddNewSceneObject() to update the client since |
576 | // process causes some clients to fail to display the attachment properly. | 575 | // we'll be doing that later on. Scheduling more |
577 | m_Scene.AddNewSceneObject(group, true, false); | 576 | // than one full update during the attachment |
577 | // process causes some clients to fail to display | ||
578 | // the attachment properly. | ||
579 | // Also, don't persist attachments. | ||
580 | m_Scene.AddNewSceneObject(group, false, false); | ||
581 | } | ||
582 | else | ||
583 | { | ||
584 | m_Scene.AddNewSceneObject(group, true, false); | ||
585 | } | ||
578 | 586 | ||
579 | // m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z); | 587 | // m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z); |
580 | // if attachment we set it's asset id so object updates can reflect that | 588 | // if attachment we set it's asset id so object updates can reflect that |