aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/InventoryItemBase.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/InventoryItemBase.cs
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC-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/InventoryItemBase.cs')
-rw-r--r--OpenSim/Framework/InventoryItemBase.cs26
1 files changed, 13 insertions, 13 deletions
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 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using libsecondlife; 28using OpenMetaverse;
29 29
30namespace OpenSim.Framework 30namespace OpenSim.Framework
31{ 31{
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
37 /// <summary> 37 /// <summary>
38 /// The UUID of the associated asset on the asset server 38 /// The UUID of the associated asset on the asset server
39 /// </summary> 39 /// </summary>
40 private LLUUID _assetID; 40 private UUID _assetID;
41 41
42 /// <summary> 42 /// <summary>
43 /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc) 43 /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc)
@@ -52,9 +52,9 @@ namespace OpenSim.Framework
52 /// <summary> 52 /// <summary>
53 /// The creator of this item 53 /// The creator of this item
54 /// </summary> 54 /// </summary>
55 private LLUUID _creator; 55 private UUID _creator;
56 56
57 private LLUUID _owner; 57 private UUID _owner;
58 58
59 private uint _nextPermissions; 59 private uint _nextPermissions;
60 60
@@ -76,12 +76,12 @@ namespace OpenSim.Framework
76 /// <summary> 76 /// <summary>
77 /// The folder this item is contained in 77 /// The folder this item is contained in
78 /// </summary> 78 /// </summary>
79 private LLUUID _folder; 79 private UUID _folder;
80 80
81 /// <summary> 81 /// <summary>
82 /// A UUID containing the ID for the inventory item itself 82 /// A UUID containing the ID for the inventory item itself
83 /// </summary> 83 /// </summary>
84 private LLUUID _id; 84 private UUID _id;
85 85
86 /// <summary> 86 /// <summary>
87 /// The type of inventory item. (Can be slightly different to the asset type 87 /// The type of inventory item. (Can be slightly different to the asset type
@@ -97,7 +97,7 @@ namespace OpenSim.Framework
97 /// <summary> 97 /// <summary>
98 /// 98 ///
99 /// </summary> 99 /// </summary>
100 private LLUUID _groupID; 100 private UUID _groupID;
101 101
102 /// <summary> 102 /// <summary>
103 /// 103 ///
@@ -124,7 +124,7 @@ namespace OpenSim.Framework
124 /// </summary> 124 /// </summary>
125 private int _creationDate; 125 private int _creationDate;
126 126
127 public virtual LLUUID ID { 127 public virtual UUID ID {
128 get { 128 get {
129 return _id; 129 return _id;
130 } 130 }
@@ -139,19 +139,19 @@ namespace OpenSim.Framework
139 set { _invType = value; } 139 set { _invType = value; }
140 } 140 }
141 141
142 public virtual LLUUID Folder 142 public virtual UUID Folder
143 { 143 {
144 get { return _folder; } 144 get { return _folder; }
145 set { _folder = value; } 145 set { _folder = value; }
146 } 146 }
147 147
148 public virtual LLUUID Owner 148 public virtual UUID Owner
149 { 149 {
150 get { return _owner; } 150 get { return _owner; }
151 set { _owner = value; } 151 set { _owner = value; }
152 } 152 }
153 153
154 public virtual LLUUID Creator 154 public virtual UUID Creator
155 { 155 {
156 get { return _creator; } 156 get { return _creator; }
157 set { _creator = value; } 157 set { _creator = value; }
@@ -199,13 +199,13 @@ namespace OpenSim.Framework
199 set { _assetType = value; } 199 set { _assetType = value; }
200 } 200 }
201 201
202 public virtual LLUUID AssetID 202 public virtual UUID AssetID
203 { 203 {
204 get { return _assetID; } 204 get { return _assetID; }
205 set { _assetID = value; } 205 set { _assetID = value; }
206 } 206 }
207 207
208 public virtual LLUUID GroupID 208 public virtual UUID GroupID
209 { 209 {
210 get 210 get
211 { 211 {