Merge branch 'master' into careminster-presence-refactor

OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Xml;
@@ -74,6 +75,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         {
             m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject");
 
+            try
+            {
                 // If we can't take it, we can't attach it!
                 SceneObjectPart part = m_scene.GetSceneObjectPart(objectLocalID);
                 if (part == null)
@@ -99,6 +102,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     }
                 }
             }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[ATTACHMENTS MODULE]: exception upon Attach Object {0}", e);
+            }
+        }
         
         public bool AttachObject(
             IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)

OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

@@ -1755,7 +1755,11 @@ namespace OpenSim.Region.Framework.Scenes
                 item.AssetType = asset.Type;
                 item.InvType = (int)InventoryType.Object;
 
-                item.Folder = UUID.Zero; // Objects folder!
+                InventoryFolderBase folder = InventoryService.GetFolderForType(remoteClient.AgentId, AssetType.Object);
+                if (folder != null)
+                    item.Folder = folder.ID;
+                else // oopsies
+                    item.Folder = UUID.Zero;
 
                 if ((remoteClient.AgentId != grp.RootPart.OwnerID) && Permissions.PropagatePermissions())
                 {

OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

@@ -1206,6 +1206,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             detachedpos = avatar.AbsolutePosition;
+            RootPart.FromItemID = UUID.Zero;
 
             AbsolutePosition = detachedpos;
             m_rootPart.AttachedAvatar = UUID.Zero;