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

oops

0.9.1.0-post-fixes
UbitUmarov 2018-11-13 00:58:27 +00:00
parent e4ed2d7d6c
commit cc10cd2161
1 changed files with 74 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -521,9 +521,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
objlist[0].OwnerID.ToString()); objlist[0].OwnerID.ToString());
m_Scene.AssetService.Store(asset); m_Scene.AssetService.Store(asset);
item.AssetID = asset.FullID;
item.Description = desc; item.Description = desc;
item.Name = name; item.Name = name;
item.AssetType = (int)AssetType.Object;
item.AssetID = asset.FullID;
if (DeRezAction.SaveToExistingUserInventoryItem == action) if (DeRezAction.SaveToExistingUserInventoryItem == action)
{ {
@ -696,9 +697,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
return null; return null;
} }
return item;
} }
else
{
// Folder magic // Folder magic
// //
if (action == DeRezAction.Delete) if (action == DeRezAction.Delete)
@ -781,10 +782,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
item.Folder = folder.ID; item.Folder = folder.ID;
item.Owner = userID; item.Owner = userID;
item.CreationDate = Util.UnixTimeSinceEpoch(); item.CreationDate = Util.UnixTimeSinceEpoch();
}
return item; return item;
} }
// compatibility do not use // compatibility do not use
public virtual SceneObjectGroup RezObject( public virtual SceneObjectGroup RezObject(
IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,