From fef3b3689492dea63693c964bcdbec9f5137eb5e Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Mon, 21 Apr 2008 07:09:17 +0000 Subject: * Optimised using statements and namespace references across entire project (this took a while to run). --- .../Environment/Modules/LandManagement/LandChannel.cs | 14 +++++--------- .../Modules/LandManagement/LandManagementModule.cs | 12 ++---------- .../Environment/Modules/LandManagement/LandObject.cs | 9 +++++---- 3 files changed, 12 insertions(+), 23 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/LandManagement') 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 @@ using System; using System.Collections.Generic; -using System.Text; using Axiom.Math; using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework; -using OpenSim.Framework.Console; -using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Physics.Manager; -using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs; - namespace OpenSim.Region.Environment.Modules.LandManagement { public class LandChannel : ILandChannel @@ -245,7 +241,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / Convert.ToDouble(4.0))); y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / Convert.ToDouble(4.0))); } - catch (System.OverflowException) + catch (OverflowException) { return null; } @@ -957,7 +953,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement // and land has been validated as well, this method transfers // the land ownership - public void handleLandBuyRequest(Object o, LandBuyArgs e) + public void handleLandBuyRequest(Object o, EventManager.LandBuyArgs e) { if (e.economyValidated && e.landValidated) { @@ -976,7 +972,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement // be validated. This method validates the right to buy the // parcel - public void handleLandValidationRequest(Object o, LandBuyArgs e) + public void handleLandValidationRequest(Object o, EventManager.LandBuyArgs e) { if (e.landValidated == false) { @@ -994,7 +990,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement int saleprice = lob.landData.salePrice; LLUUID pOwnerID = lob.landData.ownerID; - bool landforsale = ((lob.landData.landFlags & (uint)(libsecondlife.Parcel.ParcelFlags.ForSale | libsecondlife.Parcel.ParcelFlags.ForSaleObjects | libsecondlife.Parcel.ParcelFlags.SellParcelObjects)) != 0); + bool landforsale = ((lob.landData.landFlags & (uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects)) != 0); if ((AuthorizedID == LLUUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale) { 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 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Collections.Generic; -using libsecondlife; -using libsecondlife.Packets; -using OpenSim.Framework; -using OpenSim.Framework.Console; -using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Interfaces; using Nini.Config; - -using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs; +using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Modules.LandManagement { 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 @@ using System; using System.Collections.Generic; +using System.Reflection; using libsecondlife; using libsecondlife.Packets; +using log4net; using OpenSim.Framework; -using OpenSim.Framework.Console; -using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Modules.LandManagement { @@ -46,7 +47,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement { #region Member Variables - private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected LandData m_landData = new LandData(); protected List primsOverMe = new List(); @@ -273,7 +274,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement newData.claimPrice = claimprice; newData.salePrice = 0; newData.authBuyerID = LLUUID.Zero; - newData.landFlags &= ~(uint)(libsecondlife.Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects); + newData.landFlags &= ~(uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects); m_scene.LandChannel.updateLandObject(landData.localID, newData); sendLandUpdateToAvatarsOverMe(); -- cgit v1.1