ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

- remove the Metadata property from AssetBase and return all previous

Browse Source 
properties as before
- prefix private variables with m_ in AssetBase.cs
- related to Mantis #3122, as mentioned in
  https://lists.berlios.de/pipermail/opensim-dev/2009-February/005088.html
- all services will likely need to be upgraded after this commit
This commit is contained in:
Mike Mazur
2009-02-17 01:36:44 +00:00
parent 7cc9062137
commit 76c0935ec7
38 changed files with 415 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@@ -7679,7 +7679,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
Transfer.TransferInfo.Params = new byte[20];
Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
int assType = req.AssetInf.Metadata.Type;
int assType = req.AssetInf.Type;
Array.Copy(Utils.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4);
}
else if (req.AssetRequestSource == 3)

22
OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
View File

@@ -198,13 +198,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private void Initialise(UUID fileID, string fileName)
{
m_asset = new AssetBase();
m_asset.Metadata.FullID = fileID;
m_asset.Metadata.Type = type;
m_asset.FullID = fileID;
m_asset.Type = type;
m_asset.Data = new byte[0];
m_asset.Metadata.Name = fileName;
m_asset.Metadata.Description = "empty";
m_asset.Metadata.Local = true;
m_asset.Metadata.Temporary = true;
m_asset.Name = fileName;
m_asset.Description = "empty";
m_asset.Local = true;
m_asset.Temporary = true;
mXferID = Util.GetNextXferID();
}
@@ -215,13 +215,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void RequestStartXfer(IClientAPI pRemoteClient)
{
if (!String.IsNullOrEmpty(m_asset.Metadata.Name))
if (!String.IsNullOrEmpty(m_asset.Name))
{
pRemoteClient.SendXferRequest(mXferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, Utils.StringToBytes(m_asset.Metadata.Name));
pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name));
}
else
{
pRemoteClient.SendXferRequest(mXferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, new byte[0]);
pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, new byte[0]);
}
}
@@ -265,7 +265,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
handlerUploadDone = UploadDone;
if (handlerUploadDone != null)
{
handlerUploadDone(m_asset.Metadata.Name, m_asset.Metadata.FullID, mXferID, m_asset.Data, remoteClient);
handlerUploadDone(m_asset.Name, m_asset.FullID, mXferID, m_asset.Data, remoteClient);
}
}
@@ -274,7 +274,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
handlerAbort = UploadAborted;
if (handlerAbort != null)
{
handlerAbort(m_asset.Metadata.Name, m_asset.Metadata.FullID, mXferID, remoteClient);
handlerAbort(m_asset.Name, m_asset.FullID, mXferID, remoteClient);
}
}
}

2
OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
View File

@@ -405,7 +405,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// </summary>
public UUID AssetId
{
get { return m_asset_ref.Metadata.FullID; }
get { return m_asset_ref.FullID; }
}
/// <summary>

6
OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
View File

@@ -318,9 +318,9 @@ namespace OpenSim.Region.Communications.Hypergrid
//Console.WriteLine("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width);
byte[] imageData = OpenJPEG.EncodeFromImage(m, true);
AssetBase ass = new AssetBase(UUID.Random(), "region " + info.RegionID.ToString());
info.RegionSettings.TerrainImageID = ass.Metadata.FullID;
ass.Metadata.Type = (int)AssetType.Texture;
ass.Metadata.Temporary = false;
info.RegionSettings.TerrainImageID = ass.FullID;
ass.Type = (int)AssetType.Texture;
ass.Temporary = false;
ass.Data = imageData;
m_assetcache.AddAsset(ass);

20
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
View File

@@ -172,10 +172,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
"[ASSET TRANSACTIONS]: Updating task item {0} in {1} with asset in transaction {2}",
item.Name, part.Name, transactionID);
asset.Metadata.Name = item.Name;
asset.Metadata.Description = item.Description;
asset.Metadata.Type = (sbyte)item.Type;
item.AssetID = asset.Metadata.FullID;
asset.Name = item.Name;
asset.Description = item.Description;
asset.Type = (sbyte)item.Type;
item.AssetID = asset.FullID;
Manager.MyScene.CommsManager.AssetCache.AddAsset(asset);
@@ -207,14 +207,14 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
asset = GetTransactionAsset(transactionID);
}
if (asset != null && asset.Metadata.FullID == assetID)
if (asset != null && asset.FullID == assetID)
{
// Assets never get updated, new ones get created
asset.Metadata.FullID = UUID.Random();
asset.Metadata.Name = item.Name;
asset.Metadata.Description = item.Description;
asset.Metadata.Type = (sbyte)item.AssetType;
item.AssetID = asset.Metadata.FullID;
asset.FullID = UUID.Random();
asset.Name = item.Name;
asset.Description = item.Description;
asset.Type = (sbyte)item.AssetType;
item.AssetID = asset.FullID;
Manager.MyScene.CommsManager.AssetCache.AddAsset(asset);
}

26
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
View File

@@ -111,13 +111,13 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
{
ourClient = remoteClient;
m_asset = new AssetBase();
m_asset.Metadata.FullID = assetID;
m_asset.Metadata.Type = type;
m_asset.FullID = assetID;
m_asset.Type = type;
m_asset.Data = data;
m_asset.Metadata.Name = "blank";
m_asset.Metadata.Description = "empty";
m_asset.Metadata.Local = storeLocal;
m_asset.Metadata.Temporary = tempFile;
m_asset.Name = "blank";
m_asset.Description = "empty";
m_asset.Local = storeLocal;
m_asset.Temporary = tempFile;
TransactionID = transaction;
m_storeLocal = storeLocal;
@@ -138,12 +138,12 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
protected void RequestStartXfer()
{
XferID = Util.GetNextXferID();
ourClient.SendXferRequest(XferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, new byte[0]);
ourClient.SendXferRequest(XferID, m_asset.Type, m_asset.FullID, 0, new byte[0]);
}
protected void SendCompleteMessage()
{
ourClient.SendAssetUploadCompleteMessage(m_asset.Metadata.Type, true, m_asset.Metadata.FullID);
ourClient.SendAssetUploadCompleteMessage(m_asset.Type, true, m_asset.FullID);
m_finished = true;
if (m_createItem)
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
DateTime now = DateTime.Now;
string filename =
String.Format("{6}_{7}_{0:d2}{1:d2}{2:d2}_{3:d2}{4:d2}{5:d2}.dat", now.Year, now.Month, now.Day,
now.Hour, now.Minute, now.Second, m_asset.Metadata.Name, m_asset.Metadata.Type);
now.Hour, now.Minute, now.Second, m_asset.Name, m_asset.Type);
SaveAssetToFile(filename, m_asset.Data);
}
}
@@ -194,9 +194,9 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
this.invType = invType;
this.wearableType = wearableType;
nextPerm = nextOwnerMask;
m_asset.Metadata.Name = name;
m_asset.Metadata.Description = description;
m_asset.Metadata.Type = type;
m_asset.Name = name;
m_asset.Description = description;
m_asset.Type = type;
if (m_finished)
{
@@ -223,7 +223,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
item.Owner = ourClient.AgentId;
item.Creator = ourClient.AgentId;
item.ID = UUID.Random();
item.AssetID = m_asset.Metadata.FullID;
item.AssetID = m_asset.FullID;
item.Description = m_description;
item.Name = m_name;
item.AssetType = type;

12
OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
View File

@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
/// </summary>
private AssetBase m_asset;
//public UUID assetID { get { return m_asset.Metadata.FullID; } }
//public UUID assetID { get { return m_asset.FullID; } }
// private bool m_cancel = false;
@@ -116,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
// See ITextureSender
public bool SendTexturePacket()
{
//m_log.DebugFormat("[TEXTURE SENDER]: Sending packet for {0}", m_asset.Metadata.FullID);
//m_log.DebugFormat("[TEXTURE SENDER]: Sending packet for {0}", m_asset.FullID);
SendPacket();
counter++;
@@ -153,7 +153,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
{
if (NumPackets == 0)
{
RequestUser.SendImageFirstPart(1, m_asset.Metadata.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2);
RequestUser.SendImageFirstPart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2);
PacketCounter++;
}
else
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
Array.Copy(m_asset.Data, 0, ImageData1, 0, 600);
RequestUser.SendImageFirstPart(
(ushort)(NumPackets), m_asset.Metadata.FullID, (uint)m_asset.Data.Length, ImageData1, 2);
(ushort)(NumPackets), m_asset.FullID, (uint)m_asset.Data.Length, ImageData1, 2);
PacketCounter++;
}
}
@@ -178,11 +178,11 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
catch (ArgumentOutOfRangeException)
{
m_log.Error("[TEXTURE SENDER]: Unable to separate texture into multiple packets: Array bounds failure on asset:" +
m_asset.Metadata.ID);
m_asset.ID);
return;
}
RequestUser.SendImageNextPart((ushort)PacketCounter, m_asset.Metadata.FullID, imageData);
RequestUser.SendImageNextPart((ushort)PacketCounter, m_asset.FullID, imageData);
PacketCounter++;
}
}

2
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
View File

@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
AssetBase asset = new AssetBase(new UUID(uuid), "RandomName");
asset.Metadata.Type = assetType;
asset.Type = assetType;
asset.Data = data;
commsManager.AssetCache.AddAsset(asset);

18
OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
View File

@@ -231,21 +231,21 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
// Create a new asset for user
AssetBase asset = new AssetBase();
asset.Metadata.FullID = UUID.Random();
asset.FullID = UUID.Random();
asset.Data = assetData;
asset.Metadata.Name = "DynamicImage" + Util.RandomClass.Next(1, 10000);
asset.Metadata.Type = 0;
asset.Metadata.Description = "dynamic image";
asset.Metadata.Local = false;
asset.Metadata.Temporary = true;
asset.Name = "DynamicImage" + Util.RandomClass.Next(1, 10000);
asset.Type = 0;
asset.Description = "dynamic image";
asset.Local = false;
asset.Temporary = true;
scene.CommsManager.AssetCache.AddAsset(asset);
LastAssetID = asset.Metadata.FullID;
LastAssetID = asset.FullID;
IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>();
if (cacheLayerDecode != null)
{
cacheLayerDecode.syncdecode(asset.Metadata.FullID, asset.Data);
cacheLayerDecode.syncdecode(asset.FullID, asset.Data);
}
cacheLayerDecode = null;
@@ -256,7 +256,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
UUID oldID = tmptex.DefaultTexture.TextureID;
scene.CommsManager.AssetCache.ExpireAsset(oldID);
tmptex.DefaultTexture.TextureID = asset.Metadata.FullID;
tmptex.DefaultTexture.TextureID = asset.FullID;
// I'm pretty sure we always want to force this to true
tmptex.DefaultTexture.Fullbright = true;

2
OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
View File

@@ -326,8 +326,6 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
UUID toID = new UUID(address.Substring(0, address.IndexOf("@")));
String unused;
if (IsLocal(toID)) // TODO FIX check to see if it is local
{
// object in this region

2
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
//m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType);
AssetBase asset = new AssetBase(new UUID(uuid), String.Empty);
asset.Metadata.Type = assetType;
asset.Type = assetType;
asset.Data = data;
m_scene.CommsManager.AssetCache.AddAsset(asset);

16
OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
View File

@@ -86,16 +86,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
string extension = string.Empty;
if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Metadata.Type))
if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Type))
{
extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Metadata.Type];
extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Type];
}
xtw.WriteElementString("filename", uuid.ToString() + extension);
xtw.WriteElementString("name", asset.Metadata.Name);
xtw.WriteElementString("description", asset.Metadata.Description);
xtw.WriteElementString("asset-type", asset.Metadata.Type.ToString());
xtw.WriteElementString("name", asset.Name);
xtw.WriteElementString("description", asset.Description);
xtw.WriteElementString("asset-type", asset.Type.ToString());
xtw.WriteEndElement();
}
@@ -123,15 +123,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
string extension = string.Empty;
if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Metadata.Type))
if (ArchiveConstants.ASSET_TYPE_TO_EXTENSION.ContainsKey(asset.Type))
{
extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Metadata.Type];
extension = ArchiveConstants.ASSET_TYPE_TO_EXTENSION[asset.Type];
}
else
{
m_log.ErrorFormat(
"[ARCHIVER]: Unrecognized asset type {0} with uuid {1}. This asset will be saved but not reloaded",
asset.Metadata.Type, asset.Metadata.ID);
asset.Type, asset.ID);
}
archive.AddFile(

4
OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
View File

@@ -157,8 +157,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename);
AssetBase asset = new AssetBase(new UUID(filename), metadata.Name);
asset.Metadata.Description = metadata.Description;
asset.Metadata.Type = metadata.AssetType;
asset.Description = metadata.Description;
asset.Type = metadata.AssetType;
asset.Data = data;
m_cache.AddAsset(asset);

16
OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
View File

@@ -54,13 +54,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
{
m_asset = new AssetBase();
m_asset.Metadata.FullID = UUID.Zero;
m_asset.Metadata.Type = type;
m_asset.FullID = UUID.Zero;
m_asset.Type = type;
m_asset.Data = new byte[0];
m_asset.Metadata.Name = pClientFilename;
m_asset.Metadata.Description = "empty";
m_asset.Metadata.Local = true;
m_asset.Metadata.Temporary = true;
m_asset.Name = pClientFilename;
m_asset.Description = "empty";
m_asset.Local = true;
m_asset.Temporary = true;
}
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
public void RequestStartXfer(IClientAPI pRemoteClient)
{
mXferID = Util.GetNextXferID();
pRemoteClient.SendXferRequest(mXferID, m_asset.Metadata.Type, m_asset.Metadata.FullID, 0, Utils.StringToBytes(m_asset.Metadata.Name));
pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name));
}
/// <summary>
@@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
handlerTerrainUploadDone = TerrainUploadDone;
if (handlerTerrainUploadDone != null)
{
handlerTerrainUploadDone(m_asset.Metadata.Name, m_asset.Data, remoteClient);
handlerTerrainUploadDone(m_asset.Name, m_asset.Data, remoteClient);
}
}
}

10
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@@ -985,14 +985,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
m_scene.RegionInfo.RegionSettings.TerrainImageID = TerrainImageUUID;
AssetBase asset = new AssetBase();
asset.Metadata.FullID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
asset.FullID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
asset.Data = data;
asset.Metadata.Name
asset.Name
= "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString();
asset.Metadata.Description = m_scene.RegionInfo.RegionName;
asset.Description = m_scene.RegionInfo.RegionName;
asset.Metadata.Type = 0;
asset.Metadata.Temporary = temporary;
asset.Type = 0;
asset.Temporary = temporary;
m_scene.CommsManager.AssetCache.AddAsset(asset);
}

28
OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
View File

@@ -120,12 +120,12 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
if (m_scene.CommsManager.AssetCache.TryGetCachedAsset(assetID, out asset) && (asset != null))
{
m_log.Debug("[HGScene]: Asset made it to asset cache. " + asset.Metadata.Name + " " + assetID);
m_log.Debug("[HGScene]: Asset made it to asset cache. " + asset.Name + " " + assetID);
// I think I need to store it in the asset DB too.
// For now, let me just do it for textures and scripts
if (((AssetType)asset.Metadata.Type == AssetType.Texture) ||
((AssetType)asset.Metadata.Type == AssetType.LSLBytecode) ||
((AssetType)asset.Metadata.Type == AssetType.LSLText))
if (((AssetType)asset.Type == AssetType.Texture) ||
((AssetType)asset.Type == AssetType.LSLBytecode) ||
((AssetType)asset.Type == AssetType.LSLText))
{
AssetBase asset1 = new AssetBase();
Copy(asset, asset1);
@@ -149,7 +149,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
if (asset1 != null)
{
// See long comment in AssetCache.AddAsset
if (!asset1.Metadata.Temporary || asset1.Metadata.Local)
if (!asset1.Temporary || asset1.Local)
{
// The asset cache returns instances of subclasses of AssetBase:
// TextureImage or AssetInfo. So in passing them to the remote
@@ -170,14 +170,14 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
private void Copy(AssetBase from, AssetBase to)
{
to.Data = from.Data;
to.Metadata.Description = from.Metadata.Description;
to.Metadata.FullID = from.Metadata.FullID;
to.Metadata.ID = from.Metadata.ID;
to.Metadata.Local = from.Metadata.Local;
to.Metadata.Name = from.Metadata.Name;
to.Metadata.Temporary = from.Metadata.Temporary;
to.Metadata.Type = from.Metadata.Type;
to.Data = from.Data;
to.Description = from.Description;
to.FullID = from.FullID;
to.ID = from.ID;
to.Local = from.Local;
to.Name = from.Name;
to.Temporary = from.Temporary;
to.Type = from.Type;
}
@@ -235,7 +235,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
private Dictionary<UUID, bool> SniffUUIDs(AssetBase asset)
{
Dictionary<UUID, bool> uuids = new Dictionary<UUID, bool>();
if ((asset != null) && ((AssetType)asset.Metadata.Type == AssetType.Object))
if ((asset != null) && ((AssetType)asset.Type == AssetType.Object))
{
string ass_str = Utils.BytesToString(asset.Data);
SceneObjectGroup sog = new SceneObjectGroup(ass_str, true);

54
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -193,11 +193,11 @@ namespace OpenSim.Region.Framework.Scenes
CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data);
CommsManager.AssetCache.AddAsset(asset);
item.AssetID = asset.Metadata.FullID;
item.AssetID = asset.FullID;
userInfo.UpdateItem(item);
// remoteClient.SendInventoryItemCreateUpdate(item);
return (asset.Metadata.FullID);
return (asset.FullID);
}
}
}
@@ -285,7 +285,7 @@ namespace OpenSim.Region.Framework.Scenes
}
// Update item with new asset
item.AssetID = asset.Metadata.FullID;
item.AssetID = asset.FullID;
group.UpdateInventoryItem(item);
part.GetProperties(remoteClient);
@@ -688,7 +688,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if (newName != String.Empty)
{
asset.Metadata.Name = newName;
asset.Name = newName;
}
else
{
@@ -728,10 +728,10 @@ namespace OpenSim.Region.Framework.Scenes
private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data)
{
AssetBase asset = new AssetBase();
asset.Metadata.Name = name;
asset.Metadata.Description = description;
asset.Metadata.Type = assetType;
asset.Metadata.FullID = UUID.Random();
asset.Name = name;
asset.Description = description;
asset.Type = assetType;
asset.FullID = UUID.Random();
asset.Data = (data == null) ? new byte[1] : data;
return asset;
@@ -831,11 +831,11 @@ namespace OpenSim.Region.Framework.Scenes
item.Owner = remoteClient.AgentId;
item.Creator = remoteClient.AgentId;
item.ID = UUID.Random();
item.AssetID = asset.Metadata.FullID;
item.Description = asset.Metadata.Description;
item.AssetID = asset.FullID;
item.Description = asset.Description;
item.Name = name;
item.Flags = flags;
item.AssetType = asset.Metadata.Type;
item.AssetType = asset.Type;
item.InvType = invType;
item.Folder = folderID;
item.CurrentPermissions = currentMask;
@@ -905,7 +905,7 @@ namespace OpenSim.Region.Framework.Scenes
AssetBase asset = CreateAsset(name, description, assetType, data);
CommsManager.AssetCache.AddAsset(asset);
CreateNewInventoryItem(remoteClient, folderID, asset.Metadata.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
CreateNewInventoryItem(remoteClient, folderID, asset.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
}
else
{
@@ -1553,7 +1553,7 @@ namespace OpenSim.Region.Framework.Scenes
taskItem.Flags = itemBase.Flags;
taskItem.PermsGranter = UUID.Zero;
taskItem.PermsMask = 0;
taskItem.AssetID = asset.Metadata.FullID;
taskItem.AssetID = asset.FullID;
part.Inventory.AddInventoryItem(taskItem, false);
part.GetProperties(remoteClient);
@@ -1953,16 +1953,16 @@ namespace OpenSim.Region.Framework.Scenes
(sbyte)AssetType.Object,
Utils.StringToBytes(sceneObjectXml));
CommsManager.AssetCache.AddAsset(asset);
assetID = asset.Metadata.FullID;
assetID = asset.FullID;
if (DeRezAction.SaveToExistingUserInventoryItem == action)
{
item.AssetID = asset.Metadata.FullID;
item.AssetID = asset.FullID;
userInfo.UpdateItem(item);
}
else
{
item.AssetID = asset.Metadata.FullID;
item.AssetID = asset.FullID;
if (remoteClient != null && (remoteClient.AgentId != objectGroup.RootPart.OwnerID) && Permissions.PropagatePermissions())
{
@@ -1995,9 +1995,9 @@ namespace OpenSim.Region.Framework.Scenes
// TODO: add the new fields (Flags, Sale info, etc)
item.CreationDate = Util.UnixTimeSinceEpoch();
item.Description = asset.Metadata.Description;
item.Name = asset.Metadata.Name;
item.AssetType = asset.Metadata.Type;
item.Description = asset.Description;
item.Name = asset.Name;
item.AssetType = asset.Type;
userInfo.AddItem(item);
@@ -2080,10 +2080,10 @@ namespace OpenSim.Region.Framework.Scenes
Utils.StringToBytes(sceneObjectXml));
CommsManager.AssetCache.AddAsset(asset);
item.AssetID = asset.Metadata.FullID;
item.Description = asset.Metadata.Description;
item.Name = asset.Metadata.Name;
item.AssetType = asset.Metadata.Type;
item.AssetID = asset.FullID;
item.Description = asset.Description;
item.Name = asset.Name;
item.AssetType = asset.Type;
item.InvType = (int)InventoryType.Object;
item.Folder = foundFolder;
@@ -2121,10 +2121,10 @@ namespace OpenSim.Region.Framework.Scenes
item.Creator = grp.RootPart.CreatorID;
item.Owner = remoteClient.AgentId;
item.ID = UUID.Random();
item.AssetID = asset.Metadata.FullID;
item.Description = asset.Metadata.Description;
item.Name = asset.Metadata.Name;
item.AssetType = asset.Metadata.Type;
item.AssetID = asset.FullID;
item.Description = asset.Description;
item.Name = asset.Name;
item.AssetType = asset.Type;
item.InvType = (int)InventoryType.Object;
item.Folder = UUID.Zero; // Objects folder!

8
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -3555,10 +3555,10 @@ namespace OpenSim.Region.Framework.Scenes
item.ID = UUID.Random();
item.Owner = remoteClient.AgentId;
item.AssetID = asset.Metadata.FullID;
item.Description = asset.Metadata.Description;
item.Name = asset.Metadata.Name;
item.AssetType = asset.Metadata.Type;
item.AssetID = asset.FullID;
item.Description = asset.Description;
item.Name = asset.Name;
item.AssetType = asset.Type;
item.InvType = (int)InventoryType.Object;
item.Folder = categoryID;

14
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -1025,10 +1025,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// Create new asset
AssetBase asset = new AssetBase();
asset.Metadata.Name = notecardName;
asset.Metadata.Description = "Script Generated Notecard";
asset.Metadata.Type = 7;
asset.Metadata.FullID = UUID.Random();
asset.Name = notecardName;
asset.Description = "Script Generated Notecard";
asset.Type = 7;
asset.FullID = UUID.Random();
string notecardData = "";
for (int i = 0; i < contents.Length; i++) {
@@ -1048,8 +1048,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
taskItem.ResetIDs(m_host.UUID);
taskItem.ParentID = m_host.UUID;
taskItem.CreationDate = (uint)Util.UnixTimeSinceEpoch();
taskItem.Name = asset.Metadata.Name;
taskItem.Description = asset.Metadata.Description;
taskItem.Name = asset.Name;
taskItem.Description = asset.Description;
taskItem.Type = 7;
taskItem.InvType = 7;
taskItem.OwnerID = m_host.OwnerID;
@@ -1063,7 +1063,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
taskItem.Flags = 0;
taskItem.PermsGranter = UUID.Zero;
taskItem.PermsMask = 0;
taskItem.AssetID = asset.Metadata.FullID;
taskItem.AssetID = asset.FullID;
m_host.Inventory.AddInventoryItem(taskItem, false);
}