aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/LandData.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/LandData.cs
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-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/LandData.cs')
-rw-r--r--OpenSim/Framework/LandData.cs52
1 files changed, 26 insertions, 26 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index a875a50..4e66721 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -27,22 +27,22 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using OpenMetaverse;
31 31
32namespace OpenSim.Framework 32namespace OpenSim.Framework
33{ 33{
34 public class LandData 34 public class LandData
35 { 35 {
36 private LLVector3 _AABBMax = new LLVector3(); 36 private Vector3 _AABBMax = new Vector3();
37 private LLVector3 _AABBMin = new LLVector3(); 37 private Vector3 _AABBMin = new Vector3();
38 private int _area = 0; 38 private int _area = 0;
39 private uint _auctionID = 0; //Unemplemented. If set to 0, not being auctioned 39 private uint _auctionID = 0; //Unemplemented. If set to 0, not being auctioned
40 private LLUUID _authBuyerID = LLUUID.Zero; //Unemplemented. Authorized Buyer's UUID 40 private UUID _authBuyerID = UUID.Zero; //Unemplemented. Authorized Buyer's UUID
41 private Parcel.ParcelCategory _category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category 41 private Parcel.ParcelCategory _category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
42 private int _claimDate = 0; 42 private int _claimDate = 0;
43 private int _claimPrice = 0; //Unemplemented 43 private int _claimPrice = 0; //Unemplemented
44 private LLUUID _globalID = LLUUID.Zero; 44 private UUID _globalID = UUID.Zero;
45 private LLUUID _groupID = LLUUID.Zero; //Unemplemented 45 private UUID _groupID = UUID.Zero; //Unemplemented
46 private int _groupPrims = 0; 46 private int _groupPrims = 0;
47 private bool _isGroupOwned = false; 47 private bool _isGroupOwned = false;
48 private byte[] _bitmap = new byte[512]; 48 private byte[] _bitmap = new byte[512];
@@ -50,7 +50,7 @@ namespace OpenSim.Framework
50 50
51 51
52 private uint _flags = (uint) Parcel.ParcelFlags.AllowFly | (uint) Parcel.ParcelFlags.AllowLandmark | 52 private uint _flags = (uint) Parcel.ParcelFlags.AllowFly | (uint) Parcel.ParcelFlags.AllowLandmark |
53 (uint) Parcel.ParcelFlags.AllowAllObjectEntry | 53 (uint) Parcel.ParcelFlags.AllowAPrimitiveEntry |
54 (uint) Parcel.ParcelFlags.AllowDeedToGroup | (uint) Parcel.ParcelFlags.AllowTerraform | 54 (uint) Parcel.ParcelFlags.AllowDeedToGroup | (uint) Parcel.ParcelFlags.AllowTerraform |
55 (uint) Parcel.ParcelFlags.CreateObjects | (uint) Parcel.ParcelFlags.AllowOtherScripts | 55 (uint) Parcel.ParcelFlags.CreateObjects | (uint) Parcel.ParcelFlags.AllowOtherScripts |
56 (uint) Parcel.ParcelFlags.SoundLocal; 56 (uint) Parcel.ParcelFlags.SoundLocal;
@@ -60,12 +60,12 @@ namespace OpenSim.Framework
60 private Parcel.ParcelStatus _status = Parcel.ParcelStatus.Leased; 60 private Parcel.ParcelStatus _status = Parcel.ParcelStatus.Leased;
61 private int _localID = 0; 61 private int _localID = 0;
62 private byte _mediaAutoScale = 0; 62 private byte _mediaAutoScale = 0;
63 private LLUUID _mediaID = LLUUID.Zero; 63 private UUID _mediaID = UUID.Zero;
64 64
65 private string _mediaURL = String.Empty; 65 private string _mediaURL = String.Empty;
66 private string _musicURL = String.Empty; 66 private string _musicURL = String.Empty;
67 private int _otherPrims = 0; 67 private int _otherPrims = 0;
68 private LLUUID _ownerID = LLUUID.Zero; 68 private UUID _ownerID = UUID.Zero;
69 private int _ownerPrims = 0; 69 private int _ownerPrims = 0;
70 private List<ParcelManager.ParcelAccessEntry> _parcelAccessList = new List<ParcelManager.ParcelAccessEntry>(); 70 private List<ParcelManager.ParcelAccessEntry> _parcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
71 private float _passHours = 0; 71 private float _passHours = 0;
@@ -74,11 +74,11 @@ namespace OpenSim.Framework
74 private int _selectedPrims = 0; 74 private int _selectedPrims = 0;
75 private int _simwideArea = 0; 75 private int _simwideArea = 0;
76 private int _simwidePrims = 0; 76 private int _simwidePrims = 0;
77 private LLUUID _snapshotID = LLUUID.Zero; 77 private UUID _snapshotID = UUID.Zero;
78 private LLVector3 _userLocation = new LLVector3(); 78 private Vector3 _userLocation = new Vector3();
79 private LLVector3 _userLookAt = new LLVector3(); 79 private Vector3 _userLookAt = new Vector3();
80 80
81 public LLVector3 AABBMax { 81 public Vector3 AABBMax {
82 get { 82 get {
83 return _AABBMax; 83 return _AABBMax;
84 } 84 }
@@ -87,7 +87,7 @@ namespace OpenSim.Framework
87 } 87 }
88 } 88 }
89 89
90 public LLVector3 AABBMin { 90 public Vector3 AABBMin {
91 get { 91 get {
92 return _AABBMin; 92 return _AABBMin;
93 } 93 }
@@ -114,7 +114,7 @@ namespace OpenSim.Framework
114 } 114 }
115 } 115 }
116 116
117 public LLUUID AuthBuyerID { 117 public UUID AuthBuyerID {
118 get { 118 get {
119 return _authBuyerID; 119 return _authBuyerID;
120 } 120 }
@@ -123,7 +123,7 @@ namespace OpenSim.Framework
123 } 123 }
124 } 124 }
125 125
126 public libsecondlife.Parcel.ParcelCategory Category { 126 public OpenMetaverse.Parcel.ParcelCategory Category {
127 get { 127 get {
128 return _category; 128 return _category;
129 } 129 }
@@ -150,7 +150,7 @@ namespace OpenSim.Framework
150 } 150 }
151 } 151 }
152 152
153 public LLUUID GlobalID { 153 public UUID GlobalID {
154 get { 154 get {
155 return _globalID; 155 return _globalID;
156 } 156 }
@@ -159,7 +159,7 @@ namespace OpenSim.Framework
159 } 159 }
160 } 160 }
161 161
162 public LLUUID GroupID { 162 public UUID GroupID {
163 get { 163 get {
164 return _groupID; 164 return _groupID;
165 } 165 }
@@ -231,7 +231,7 @@ namespace OpenSim.Framework
231 } 231 }
232 } 232 }
233 233
234 public libsecondlife.Parcel.ParcelStatus Status { 234 public OpenMetaverse.Parcel.ParcelStatus Status {
235 get { 235 get {
236 return _status; 236 return _status;
237 } 237 }
@@ -258,7 +258,7 @@ namespace OpenSim.Framework
258 } 258 }
259 } 259 }
260 260
261 public LLUUID MediaID { 261 public UUID MediaID {
262 get { 262 get {
263 return _mediaID; 263 return _mediaID;
264 } 264 }
@@ -294,7 +294,7 @@ namespace OpenSim.Framework
294 } 294 }
295 } 295 }
296 296
297 public LLUUID OwnerID { 297 public UUID OwnerID {
298 get { 298 get {
299 return _ownerID; 299 return _ownerID;
300 } 300 }
@@ -312,7 +312,7 @@ namespace OpenSim.Framework
312 } 312 }
313 } 313 }
314 314
315 public List<libsecondlife.ParcelManager.ParcelAccessEntry> ParcelAccessList { 315 public List<OpenMetaverse.ParcelManager.ParcelAccessEntry> ParcelAccessList {
316 get { 316 get {
317 return _parcelAccessList; 317 return _parcelAccessList;
318 } 318 }
@@ -375,7 +375,7 @@ namespace OpenSim.Framework
375 } 375 }
376 } 376 }
377 377
378 public LLUUID SnapshotID { 378 public UUID SnapshotID {
379 get { 379 get {
380 return _snapshotID; 380 return _snapshotID;
381 } 381 }
@@ -384,7 +384,7 @@ namespace OpenSim.Framework
384 } 384 }
385 } 385 }
386 386
387 public LLVector3 UserLocation { 387 public Vector3 UserLocation {
388 get { 388 get {
389 return _userLocation; 389 return _userLocation;
390 } 390 }
@@ -393,7 +393,7 @@ namespace OpenSim.Framework
393 } 393 }
394 } 394 }
395 395
396 public LLVector3 UserLookAt { 396 public Vector3 UserLookAt {
397 get { 397 get {
398 return _userLookAt; 398 return _userLookAt;
399 } 399 }
@@ -404,7 +404,7 @@ namespace OpenSim.Framework
404 404
405 public LandData() 405 public LandData()
406 { 406 {
407 _globalID = LLUUID.Random(); 407 _globalID = UUID.Random();
408 } 408 }
409 409
410 public LandData Copy() 410 public LandData Copy()