From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * This is the fabled LibOMV update with all of the libOMV types from JHurliman * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke. --- OpenSim/Framework/AssetBase.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Framework/AssetBase.cs') diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 6296067..48ef2ff 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs @@ -26,7 +26,7 @@ */ using System; -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Framework { @@ -35,7 +35,7 @@ namespace OpenSim.Framework { private byte[] _data; private string _description = String.Empty; - private LLUUID _fullid; + private UUID _fullid; private bool _local = false; private string _name = String.Empty; private bool _temporary = false; @@ -45,13 +45,13 @@ namespace OpenSim.Framework { } - public AssetBase(LLUUID assetId, string name) + public AssetBase(UUID assetId, string name) { FullID = assetId; Name = name; } - public virtual LLUUID FullID + public virtual UUID FullID { get { return _fullid; } set { _fullid = value; } @@ -60,7 +60,7 @@ namespace OpenSim.Framework public virtual string ID { get { return _fullid.ToString(); } - set { _fullid = new LLUUID(value); } + set { _fullid = new UUID(value); } } public virtual byte[] Data -- cgit v1.1