Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml

1 files changed, 46 insertions, 23 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 98b8fcc..672d95a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -811,16 +811,20 @@ namespace OpenSim.Region.Framework.Scenes
                         && oldAgentID == LibraryService.LibraryRootFolder.Owner))
                 {
                     CreateNewInventoryItem(
-                        remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType,
-                        item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch());
+                        remoteClient, item.CreatorId, item.CreatorData, newFolderID,
+                        newName, item.Description, item.Flags, callbackID, asset, (sbyte)item.InvType,
+                        item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions,
+                        item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch());
                 }
                 else
                 {  
                     // If item is transfer or permissions are off or calling agent is allowed to copy item owner's inventory item.
-                    if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0) && (m_permissions.BypassPermissions() || m_permissions.CanCopyUserInventory(remoteClient.AgentId, oldItemID)))
+                    if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0)
+                        && (m_permissions.BypassPermissions()
+                            || m_permissions.CanCopyUserInventory(remoteClient.AgentId, oldItemID)))
                     {
                         CreateNewInventoryItem(
-                            remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID,
+                            remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Description, item.Flags, callbackID,
                             asset, (sbyte) item.InvType,
                             item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions,
                             item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch());
@@ -885,32 +889,50 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Create a new inventory item.
         /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="folderID"></param>
-        /// <param name="callbackID"></param>
-        /// <param name="asset"></param>
-        /// <param name="invType"></param>
-        /// <param name="nextOwnerMask"></param>
-        public void CreateNewInventoryItem(IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID, string name, uint flags, uint callbackID,
-                                            AssetBase asset, sbyte invType, uint nextOwnerMask, int creationDate)
+        /// <param name="remoteClient">Client creating this inventory item.</param>
+        /// <param name="creatorID"></param>
+        /// <param name="creatorData"></param>
+        /// <param name="folderID">UUID of folder in which this item should be placed.</param>
+        /// <param name="name">Item name.</para>
+        /// <param name="description">Item description.</param>
+        /// <param name="flags">Item flags</param>
+        /// <param name="callbackID">Generated by the client.</para>
+        /// <param name="asset">Asset to which this item refers.</param>
+        /// <param name="invType">Type of inventory item.</param>
+        /// <param name="nextOwnerMask">Next owner pemrissions mask.</param>
+        /// <param name="creationDate">Unix timestamp at which this item was created.</param>
+        public void CreateNewInventoryItem(
+            IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID,
+            string name, string description, uint flags, uint callbackID,
+            AssetBase asset, sbyte invType, uint nextOwnerMask, int creationDate)
         {
             CreateNewInventoryItem(
-                remoteClient, creatorID, creatorData, folderID, name, flags, callbackID, asset, invType,
+                remoteClient, creatorID, creatorData, folderID, name, description, flags, callbackID, asset, invType,
                 (uint)PermissionMask.All, (uint)PermissionMask.All, 0, nextOwnerMask, 0, creationDate);
         }
 
         /// <summary>
         /// Create a new Inventory Item
         /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="folderID"></param>
-        /// <param name="callbackID"></param>
-        /// <param name="asset"></param>
-        /// <param name="invType"></param>
-        /// <param name="nextOwnerMask"></param>
-        /// <param name="creationDate"></param>
+        /// <param name="remoteClient">Client creating this inventory item.</param>
+        /// <param name="creatorID"></param>
+        /// <param name="creatorData"></param>
+        /// <param name="folderID">UUID of folder in which this item should be placed.</param>
+        /// <param name="name">Item name.</para>
+        /// <param name="description">Item description.</param>
+        /// <param name="flags">Item flags</param>
+        /// <param name="callbackID">Generated by the client.</para>
+        /// <param name="asset">Asset to which this item refers.</param>
+        /// <param name="invType">Type of inventory item.</param>
+        /// <param name="baseMask">Base permissions mask.</param>
+        /// <param name="currentMask">Current permissions mask.</param>
+        /// <param name="everyoneMask">Everyone permissions mask.</param>
+        /// <param name="nextOwnerMask">Next owner pemrissions mask.</param>
+        /// <param name="groupMask">Group permissions mask.</param>
+        /// <param name="creationDate">Unix timestamp at which this item was created.</param>
         private void CreateNewInventoryItem(
-            IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID, string name, uint flags, uint callbackID, AssetBase asset, sbyte invType,
+            IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID,
+            string name, string description, uint flags, uint callbackID, AssetBase asset, sbyte invType,
             uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate)
         {
             InventoryItemBase item = new InventoryItemBase();
@@ -919,8 +941,8 @@ namespace OpenSim.Region.Framework.Scenes
             item.CreatorData = creatorData;
             item.ID = UUID.Random();
             item.AssetID = asset.FullID;
-            item.Description = asset.Description;
             item.Name = name;
+            item.Description = description;
             item.Flags = flags;
             item.AssetType = asset.Type;
             item.InvType = invType;
@@ -1002,7 +1024,8 @@ namespace OpenSim.Region.Framework.Scenes
                 asset.Description = description;
 
                 CreateNewInventoryItem(
-                    remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, name, 0, callbackID, asset, invType,
+                    remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID,
+                    name, description, 0, callbackID, asset, invType,
                     (uint)PermissionMask.All, (uint)PermissionMask.All, (uint)PermissionMask.All,
                     (uint)PermissionMask.All, (uint)PermissionMask.All, Util.UnixTimeSinceEpoch());
             }