aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2009-07-25 15:49:10 +0000
committerTeravus Ovares2009-07-25 15:49:10 +0000
commit64bd9a335444379ebe1cad8e34d5b5953a76f671 (patch)
tree66b9ce07dbf95e4c118e3d639068e2c44fc52f58 /OpenSim/Framework
parent* Apply http://opensimulator.org/mantis/view.php?id=3586 (diff)
downloadopensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.zip
opensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.gz
opensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.bz2
opensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.xz
* Updates libOMV to version 0.7.0
* Uses mantis #3811 as a base (thanks jhuliman) with changes. * E-mail regarding interface changes sent to the opensim-dev list * Archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007219.html
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/LandData.cs18
-rw-r--r--OpenSim/Framework/LandUpdateArgs.cs2
2 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index f793213..d6afb95 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework
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 UUID _authBuyerID = UUID.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 ParcelCategory _category = ParcelCategory.None; //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 UUID _globalID = UUID.Zero; 44 private UUID _globalID = UUID.Zero;
@@ -49,15 +49,15 @@ namespace OpenSim.Framework
49 private string _description = String.Empty; 49 private string _description = String.Empty;
50 50
51 51
52 private uint _flags = (uint) Parcel.ParcelFlags.AllowFly | (uint) Parcel.ParcelFlags.AllowLandmark | 52 private uint _flags = (uint) ParcelFlags.AllowFly | (uint) ParcelFlags.AllowLandmark |
53 (uint) Parcel.ParcelFlags.AllowAPrimitiveEntry | 53 (uint) ParcelFlags.AllowAPrimitiveEntry |
54 (uint) Parcel.ParcelFlags.AllowDeedToGroup | (uint) Parcel.ParcelFlags.AllowTerraform | 54 (uint) ParcelFlags.AllowDeedToGroup | (uint) ParcelFlags.AllowTerraform |
55 (uint) Parcel.ParcelFlags.CreateObjects | (uint) Parcel.ParcelFlags.AllowOtherScripts | 55 (uint) ParcelFlags.CreateObjects | (uint) ParcelFlags.AllowOtherScripts |
56 (uint) Parcel.ParcelFlags.SoundLocal; 56 (uint) ParcelFlags.SoundLocal;
57 57
58 private byte _landingType = 0; 58 private byte _landingType = 0;
59 private string _name = "Your Parcel"; 59 private string _name = "Your Parcel";
60 private Parcel.ParcelStatus _status = Parcel.ParcelStatus.Leased; 60 private ParcelStatus _status = ParcelStatus.Leased;
61 private int _localID = 0; 61 private int _localID = 0;
62 private byte _mediaAutoScale = 0; 62 private byte _mediaAutoScale = 0;
63 private UUID _mediaID = UUID.Zero; 63 private UUID _mediaID = UUID.Zero;
@@ -125,7 +125,7 @@ namespace OpenSim.Framework
125 } 125 }
126 } 126 }
127 127
128 public Parcel.ParcelCategory Category { 128 public ParcelCategory Category {
129 get { 129 get {
130 return _category; 130 return _category;
131 } 131 }
@@ -233,7 +233,7 @@ namespace OpenSim.Framework
233 } 233 }
234 } 234 }
235 235
236 public Parcel.ParcelStatus Status { 236 public ParcelStatus Status {
237 get { 237 get {
238 return _status; 238 return _status;
239 } 239 }
diff --git a/OpenSim/Framework/LandUpdateArgs.cs b/OpenSim/Framework/LandUpdateArgs.cs
index 7b065a3..9760a1d 100644
--- a/OpenSim/Framework/LandUpdateArgs.cs
+++ b/OpenSim/Framework/LandUpdateArgs.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework
33 public class LandUpdateArgs : EventArgs 33 public class LandUpdateArgs : EventArgs
34 { 34 {
35 public UUID AuthBuyerID; 35 public UUID AuthBuyerID;
36 public Parcel.ParcelCategory Category; 36 public ParcelCategory Category;
37 public string Desc; 37 public string Desc;
38 public UUID GroupID; 38 public UUID GroupID;
39 public byte LandingType; 39 public byte LandingType;