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/InventoryItemBase.cs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'OpenSim/Framework/InventoryItemBase.cs') diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs index 85b08cb..4441e73 100644 --- a/OpenSim/Framework/InventoryItemBase.cs +++ b/OpenSim/Framework/InventoryItemBase.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Framework { @@ -37,7 +37,7 @@ namespace OpenSim.Framework /// /// The UUID of the associated asset on the asset server /// - private LLUUID _assetID; + private UUID _assetID; /// /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc) @@ -52,9 +52,9 @@ namespace OpenSim.Framework /// /// The creator of this item /// - private LLUUID _creator; + private UUID _creator; - private LLUUID _owner; + private UUID _owner; private uint _nextPermissions; @@ -76,12 +76,12 @@ namespace OpenSim.Framework /// /// The folder this item is contained in /// - private LLUUID _folder; + private UUID _folder; /// /// A UUID containing the ID for the inventory item itself /// - private LLUUID _id; + private UUID _id; /// /// The type of inventory item. (Can be slightly different to the asset type @@ -97,7 +97,7 @@ namespace OpenSim.Framework /// /// /// - private LLUUID _groupID; + private UUID _groupID; /// /// @@ -124,7 +124,7 @@ namespace OpenSim.Framework /// private int _creationDate; - public virtual LLUUID ID { + public virtual UUID ID { get { return _id; } @@ -139,19 +139,19 @@ namespace OpenSim.Framework set { _invType = value; } } - public virtual LLUUID Folder + public virtual UUID Folder { get { return _folder; } set { _folder = value; } } - public virtual LLUUID Owner + public virtual UUID Owner { get { return _owner; } set { _owner = value; } } - public virtual LLUUID Creator + public virtual UUID Creator { get { return _creator; } set { _creator = value; } @@ -199,13 +199,13 @@ namespace OpenSim.Framework set { _assetType = value; } } - public virtual LLUUID AssetID + public virtual UUID AssetID { get { return _assetID; } set { _assetID = value; } } - public virtual LLUUID GroupID + public virtual UUID GroupID { get { -- cgit v1.1