aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/LandManagement
diff options
context:
space:
mode:
authorAdam Frisby2008-04-21 07:09:17 +0000
committerAdam Frisby2008-04-21 07:09:17 +0000
commitfef3b3689492dea63693c964bcdbec9f5137eb5e (patch)
tree7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Region/Environment/Modules/LandManagement
parent* Terrain Module code has been reformatted to comply with guidelines. (diff)
downloadopensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Region/Environment/Modules/LandManagement')
-rw-r--r--OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs14
-rw-r--r--OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs12
-rw-r--r--OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs9
3 files changed, 12 insertions, 23 deletions
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
index e3b7cf5..561c5cf 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
@@ -27,18 +27,14 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using Axiom.Math; 30using Axiom.Math;
32using libsecondlife; 31using libsecondlife;
33using libsecondlife.Packets; 32using libsecondlife.Packets;
34using OpenSim.Framework; 33using OpenSim.Framework;
35using OpenSim.Framework.Console;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Scenes;
38using OpenSim.Region.Physics.Manager; 36using OpenSim.Region.Physics.Manager;
39 37
40using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs;
41
42namespace OpenSim.Region.Environment.Modules.LandManagement 38namespace OpenSim.Region.Environment.Modules.LandManagement
43{ 39{
44 public class LandChannel : ILandChannel 40 public class LandChannel : ILandChannel
@@ -245,7 +241,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
245 x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / Convert.ToDouble(4.0))); 241 x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / Convert.ToDouble(4.0)));
246 y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / Convert.ToDouble(4.0))); 242 y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / Convert.ToDouble(4.0)));
247 } 243 }
248 catch (System.OverflowException) 244 catch (OverflowException)
249 { 245 {
250 return null; 246 return null;
251 } 247 }
@@ -957,7 +953,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
957 // and land has been validated as well, this method transfers 953 // and land has been validated as well, this method transfers
958 // the land ownership 954 // the land ownership
959 955
960 public void handleLandBuyRequest(Object o, LandBuyArgs e) 956 public void handleLandBuyRequest(Object o, EventManager.LandBuyArgs e)
961 { 957 {
962 if (e.economyValidated && e.landValidated) 958 if (e.economyValidated && e.landValidated)
963 { 959 {
@@ -976,7 +972,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
976 // be validated. This method validates the right to buy the 972 // be validated. This method validates the right to buy the
977 // parcel 973 // parcel
978 974
979 public void handleLandValidationRequest(Object o, LandBuyArgs e) 975 public void handleLandValidationRequest(Object o, EventManager.LandBuyArgs e)
980 { 976 {
981 if (e.landValidated == false) 977 if (e.landValidated == false)
982 { 978 {
@@ -994,7 +990,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
994 int saleprice = lob.landData.salePrice; 990 int saleprice = lob.landData.salePrice;
995 LLUUID pOwnerID = lob.landData.ownerID; 991 LLUUID pOwnerID = lob.landData.ownerID;
996 992
997 bool landforsale = ((lob.landData.landFlags & (uint)(libsecondlife.Parcel.ParcelFlags.ForSale | libsecondlife.Parcel.ParcelFlags.ForSaleObjects | libsecondlife.Parcel.ParcelFlags.SellParcelObjects)) != 0); 993 bool landforsale = ((lob.landData.landFlags & (uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects)) != 0);
998 if ((AuthorizedID == LLUUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale) 994 if ((AuthorizedID == LLUUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale)
999 { 995 {
1000 lock (e) 996 lock (e)
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
index 20f75df..1c36c0c 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
@@ -25,17 +25,9 @@
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 System;
29using System.Collections.Generic;
30using libsecondlife;
31using libsecondlife.Packets;
32using OpenSim.Framework;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Region.Environment.Interfaces;
36using Nini.Config; 28using Nini.Config;
37 29using OpenSim.Region.Environment.Interfaces;
38using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs; 30using OpenSim.Region.Environment.Scenes;
39 31
40namespace OpenSim.Region.Environment.Modules.LandManagement 32namespace OpenSim.Region.Environment.Modules.LandManagement
41{ 33{
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
index 69d3c05..f9684e6 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
@@ -27,12 +27,13 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
31using libsecondlife.Packets; 32using libsecondlife.Packets;
33using log4net;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Framework.Console;
34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
36using OpenSim.Region.Environment.Scenes;
36 37
37namespace OpenSim.Region.Environment.Modules.LandManagement 38namespace OpenSim.Region.Environment.Modules.LandManagement
38{ 39{
@@ -46,7 +47,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
46 { 47 {
47 #region Member Variables 48 #region Member Variables
48 49
49 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 51
51 protected LandData m_landData = new LandData(); 52 protected LandData m_landData = new LandData();
52 protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>(); 53 protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
@@ -273,7 +274,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
273 newData.claimPrice = claimprice; 274 newData.claimPrice = claimprice;
274 newData.salePrice = 0; 275 newData.salePrice = 0;
275 newData.authBuyerID = LLUUID.Zero; 276 newData.authBuyerID = LLUUID.Zero;
276 newData.landFlags &= ~(uint)(libsecondlife.Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects); 277 newData.landFlags &= ~(uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects);
277 m_scene.LandChannel.updateLandObject(landData.localID, newData); 278 m_scene.LandChannel.updateLandObject(landData.localID, newData);
278 279
279 sendLandUpdateToAvatarsOverMe(); 280 sendLandUpdateToAvatarsOverMe();