OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

similar changes on CopyBundleToInventory

0.9.1.0-post-fixes
UbitUmarov 2018-11-12 23:53:20 +00:00
parent 191b0888a2
commit e4ed2d7d6c
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -437,7 +437,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
if (objectGroup.RootPart.Shape.PCode != (byte) PCode.Tree && if (objectGroup.RootPart.Shape.PCode != (byte) PCode.Tree &&
objectGroup.RootPart.Shape.PCode != (byte) PCode.NewTree) objectGroup.RootPart.Shape.PCode != (byte) PCode.NewTree)
objectGroup.RootPart.Shape.LastAttachPoint = (byte)objectGroup.AttachmentPoint; objectGroup.RootPart.Shape.LastAttachPoint = (byte)objectGroup.AttachmentPoint;
} }
objectGroup.AbsolutePosition = inventoryStoredPosition; objectGroup.AbsolutePosition = inventoryStoredPosition;
@ -513,15 +512,18 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
item.SalePrice = objlist[0].RootPart.SalePrice; item.SalePrice = objlist[0].RootPart.SalePrice;
} }
string name = objlist[0].RootPart.Name;
string desc = objlist[0].RootPart.Description;
AssetBase asset = CreateAsset( AssetBase asset = CreateAsset(
objlist[0].GetPartName(objlist[0].RootPart.LocalId), name, desc,
objlist[0].GetPartDescription(objlist[0].RootPart.LocalId),
(sbyte)AssetType.Object, (sbyte)AssetType.Object,
Utils.StringToBytes(itemXml), Utils.StringToBytes(itemXml),
objlist[0].OwnerID.ToString()); objlist[0].OwnerID.ToString());
m_Scene.AssetService.Store(asset); m_Scene.AssetService.Store(asset);
item.AssetID = asset.FullID; item.AssetID = asset.FullID;
item.Description = desc;
item.Name = name;
if (DeRezAction.SaveToExistingUserInventoryItem == action) if (DeRezAction.SaveToExistingUserInventoryItem == action)
{ {
@ -530,12 +532,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
else else
{ {
AddPermissions(item, objlist[0], objlist, remoteClient); AddPermissions(item, objlist[0], objlist, remoteClient);
item.CreationDate = Util.UnixTimeSinceEpoch();
item.Description = asset.Description;
item.Name = asset.Name;
item.AssetType = asset.Type;
m_Scene.AddInventoryItem(item); m_Scene.AddInventoryItem(item);
if (remoteClient != null && item.Owner == remoteClient.AgentId) if (remoteClient != null && item.Owner == remoteClient.AgentId)
@ -784,6 +780,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
item.InvType = (int)InventoryType.Object; item.InvType = (int)InventoryType.Object;
item.Folder = folder.ID; item.Folder = folder.ID;
item.Owner = userID; item.Owner = userID;
item.CreationDate = Util.UnixTimeSinceEpoch();
} }
return item; return item;