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

Changed asset CreatorID to a string

Browse Source
This commit is contained in:
John Hurliman
2010-02-22 14:18:59 -08:00
parent 71c6559a91
commit df76e95aa2
30 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/AssetBase.cs
View File

@@ -59,9 +59,10 @@ namespace OpenSim.Framework
m_metadata.FullID = UUID.Zero;
m_metadata.ID = UUID.Zero.ToString();
m_metadata.Type = (sbyte)AssetType.Unknown;
m_metadata.CreatorID = String.Empty;
}
public AssetBase(UUID assetID, string name, sbyte assetType, UUID creatorID)
public AssetBase(UUID assetID, string name, sbyte assetType, string creatorID)
{
if (assetType == (sbyte)AssetType.Unknown)
{
@@ -74,9 +75,10 @@ namespace OpenSim.Framework
m_metadata.FullID = assetID;
m_metadata.Name = name;
m_metadata.Type = assetType;
m_metadata.CreatorID = creatorID;
}
public AssetBase(string assetID, string name, sbyte assetType, UUID creatorID)
public AssetBase(string assetID, string name, sbyte assetType, string creatorID)
{
if (assetType == (sbyte)AssetType.Unknown)
{
@@ -89,6 +91,7 @@ namespace OpenSim.Framework
m_metadata.ID = assetID;
m_metadata.Name = name;
m_metadata.Type = assetType;
m_metadata.CreatorID = creatorID;
}
public bool ContainsReferences
@@ -229,7 +232,7 @@ namespace OpenSim.Framework
private byte[] m_sha1;
private bool m_local;
private bool m_temporary;
private UUID m_creatorid;
private string m_creatorid;
public UUID FullID
{
@@ -322,7 +325,7 @@ namespace OpenSim.Framework
set { m_temporary = value; }
}
public UUID CreatorID
public string CreatorID
{
get { return m_creatorid; }
set { m_creatorid = value; }

2
OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
View File

@@ -46,7 +46,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
protected static AssetBase CreateAsset(string assetIdStr, string name, string path, sbyte type)
{
AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_ID);
AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_ID.ToString());
if (!String.IsNullOrEmpty(path))
{

2
OpenSim/Framework/Capabilities/Caps.cs
View File

@@ -888,7 +888,7 @@ namespace OpenSim.Framework.Capabilities
}
AssetBase asset;
asset = new AssetBase(assetID, assetName, assType, m_agentID);
asset = new AssetBase(assetID, assetName, assType, m_agentID.ToString());
asset.Data = data;
if (AddNewAsset != null)
AddNewAsset(asset);

2
OpenSim/Framework/Tests/AssetBaseTest.cs
View File

@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Tests
private void CheckContainsReferences(AssetType assetType, bool expected)
{
AssetBase asset = new AssetBase(UUID.Zero, String.Empty, (sbyte)assetType, UUID.Zero);
AssetBase asset = new AssetBase(UUID.Zero, String.Empty, (sbyte)assetType, UUID.Zero.ToString());
bool actual = asset.ContainsReferences;
Assert.AreEqual(expected, actual, "Expected "+assetType+".ContainsReferences to be "+expected+" but was "+actual+".");
}