1 files changed, 13 insertions, 8 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 0700aa5..2e3db48 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -719,15 +719,20 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         {
                             group.RootPart.Flags |= PrimFlags.Phantom;
                             group.RootPart.IsAttachment = true;
-                        }
 
-                        // If we're rezzing an attachment then don't ask
-                        // AddNewSceneObject() to update the client since
-                        // we'll be doing that later on.  Scheduling more than
-                        // one full update during the attachment
-                        // process causes some clients to fail to display the
-                        // attachment properly.
-                        m_Scene.AddNewSceneObject(group, true, false);
+                            // If we're rezzing an attachment then don't ask
+                            // AddNewSceneObject() to update the client since
+                            // we'll be doing that later on.  Scheduling more
+                            // than one full update during the attachment
+                            // process causes some clients to fail to display
+                            // the attachment properly.
+                            // Also, don't persist attachments.
+                            m_Scene.AddNewSceneObject(group, false, false);
+                        }
+                        else
+                        {
+                            m_Scene.AddNewSceneObject(group, true, false);
+                        }
 
                         // if attachment we set it's asset id so object updates
                         // can reflect that, if not, we set it's position in world.