diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/AssetBase.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* 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.
Diffstat (limited to 'OpenSim/Framework/AssetBase.cs')
-rw-r--r-- | OpenSim/Framework/AssetBase.cs | 10 |
1 files changed, 5 insertions, 5 deletions
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 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using libsecondlife; | 29 | using OpenMetaverse; |
30 | 30 | ||
31 | namespace OpenSim.Framework | 31 | namespace OpenSim.Framework |
32 | { | 32 | { |
@@ -35,7 +35,7 @@ namespace OpenSim.Framework | |||
35 | { | 35 | { |
36 | private byte[] _data; | 36 | private byte[] _data; |
37 | private string _description = String.Empty; | 37 | private string _description = String.Empty; |
38 | private LLUUID _fullid; | 38 | private UUID _fullid; |
39 | private bool _local = false; | 39 | private bool _local = false; |
40 | private string _name = String.Empty; | 40 | private string _name = String.Empty; |
41 | private bool _temporary = false; | 41 | private bool _temporary = false; |
@@ -45,13 +45,13 @@ namespace OpenSim.Framework | |||
45 | { | 45 | { |
46 | } | 46 | } |
47 | 47 | ||
48 | public AssetBase(LLUUID assetId, string name) | 48 | public AssetBase(UUID assetId, string name) |
49 | { | 49 | { |
50 | FullID = assetId; | 50 | FullID = assetId; |
51 | Name = name; | 51 | Name = name; |
52 | } | 52 | } |
53 | 53 | ||
54 | public virtual LLUUID FullID | 54 | public virtual UUID FullID |
55 | { | 55 | { |
56 | get { return _fullid; } | 56 | get { return _fullid; } |
57 | set { _fullid = value; } | 57 | set { _fullid = value; } |
@@ -60,7 +60,7 @@ namespace OpenSim.Framework | |||
60 | public virtual string ID | 60 | public virtual string ID |
61 | { | 61 | { |
62 | get { return _fullid.ToString(); } | 62 | get { return _fullid.ToString(); } |
63 | set { _fullid = new LLUUID(value); } | 63 | set { _fullid = new UUID(value); } |
64 | } | 64 | } |
65 | 65 | ||
66 | public virtual byte[] Data | 66 | public virtual byte[] Data |