From 2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7 Mon Sep 17 00:00:00 2001 From: dr scofield (aka dirk husemann) Date: Fri, 2 Oct 2009 11:10:52 +0200 Subject: - cleaning up LandData/ILandObject capitalization issues - adding LandDataSerializer to OAR mechanics --- OpenSim/Region/Framework/Interfaces/ILandObject.cs | 72 +++++++++++----------- OpenSim/Region/Framework/Scenes/Scene.cs | 18 +++--- .../Region/Framework/Scenes/SceneObjectGroup.cs | 12 ++-- 3 files changed, 51 insertions(+), 51 deletions(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Interfaces/ILandObject.cs b/OpenSim/Region/Framework/Interfaces/ILandObject.cs index a4e90d2..c2b1292 100644 --- a/OpenSim/Region/Framework/Interfaces/ILandObject.cs +++ b/OpenSim/Region/Framework/Interfaces/ILandObject.cs @@ -37,49 +37,49 @@ namespace OpenSim.Region.Framework.Interfaces public interface ILandObject { - int getParcelMaxPrimCount(ILandObject thisObject); - int getSimulatorMaxPrimCount(ILandObject thisObject); + int GetParcelMaxPrimCount(ILandObject thisObject); + int GetSimulatorMaxPrimCount(ILandObject thisObject); - LandData landData { get; set; } - bool[,] landBitmap { get; set; } - UUID regionUUID { get; } - bool containsPoint(int x, int y); + LandData LandData { get; set; } + bool[,] LandBitmap { get; set; } + UUID RegionUUID { get; } + bool ContainsPoint(int x, int y); ILandObject Copy(); - void sendLandUpdateToAvatarsOverMe(); + void SendLandUpdateToAvatarsOverMe(); - void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client); - void updateLandProperties(LandUpdateArgs args, IClientAPI remote_client); - bool isEitherBannedOrRestricted(UUID avatar); - bool isBannedFromLand(UUID avatar); - bool isRestrictedFromLand(UUID avatar); - void sendLandUpdateToClient(IClientAPI remote_client); - List createAccessListArrayByFlag(AccessList flag); - void sendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client); - void updateAccessList(uint flags, List entries, IClientAPI remote_client); - void updateLandBitmapByteArray(); - void setLandBitmapFromByteArray(); - bool[,] getLandBitmap(); - void forceUpdateLandInfo(); - void setLandBitmap(bool[,] bitmap); + void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client); + void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client); + bool IsEitherBannedOrRestricted(UUID avatar); + bool IsBannedFromLand(UUID avatar); + bool IsRestrictedFromLand(UUID avatar); + void SendLandUpdateToClient(IClientAPI remote_client); + List CreateAccessListArrayByFlag(AccessList flag); + void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client); + void UpdateAccessList(uint flags, List entries, IClientAPI remote_client); + void UpdateLandBitmapByteArray(); + void SetLandBitmapFromByteArray(); + bool[,] GetLandBitmap(); + void ForceUpdateLandInfo(); + void SetLandBitmap(bool[,] bitmap); - bool[,] basicFullRegionLandBitmap(); - bool[,] getSquareLandBitmap(int start_x, int start_y, int end_x, int end_y); - bool[,] modifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value); - bool[,] mergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add); - void sendForceObjectSelect(int local_id, int request_type, List returnIDs, IClientAPI remote_client); - void sendLandObjectOwners(IClientAPI remote_client); - void returnObject(SceneObjectGroup obj); - void returnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client); - void resetLandPrimCounts(); - void addPrimToCount(SceneObjectGroup obj); - void removePrimFromCount(SceneObjectGroup obj); - void updateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area); + bool[,] BasicFullRegionLandBitmap(); + bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y); + bool[,] ModifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value); + bool[,] MergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add); + void SendForceObjectSelect(int local_id, int request_type, List returnIDs, IClientAPI remote_client); + void SendLandObjectOwners(IClientAPI remote_client); + void ReturnObject(SceneObjectGroup obj); + void ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client); + void ResetLandPrimCounts(); + void AddPrimToCount(SceneObjectGroup obj); + void RemovePrimFromCount(SceneObjectGroup obj); + void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area); - void deedToGroup(UUID groupID); + void DeedToGroup(UUID groupID); - void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel); - void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel); + void SetParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel); + void SetSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel); /// /// Set the media url for this land parcel diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 05a6f13..606135b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -3206,9 +3206,9 @@ namespace OpenSim.Region.Framework.Scenes ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); if (land != null) { - if (land.landData.LandingType == (byte)1 && land.landData.UserLocation != Vector3.Zero) + if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero) { - agent.startpos = land.landData.UserLocation; + agent.startpos = land.LandData.UserLocation; } } } @@ -3846,13 +3846,13 @@ namespace OpenSim.Region.Framework.Scenes public LandData GetLandData(float x, float y) { - return LandChannel.GetLandObject(x, y).landData; + return LandChannel.GetLandObject(x, y).LandData; } public LandData GetLandData(uint x, uint y) { m_log.DebugFormat("[SCENE]: returning land for {0},{1}", x, y); - return LandChannel.GetLandObject((int)x, (int)y).landData; + return LandChannel.GetLandObject((int)x, (int)y).LandData; } @@ -3880,14 +3880,14 @@ namespace OpenSim.Region.Framework.Scenes { if (parcel != null) { - if ((parcel.landData.Flags & (uint)ParcelFlags.AllowOtherScripts) != 0) + if ((parcel.LandData.Flags & (uint)ParcelFlags.AllowOtherScripts) != 0) { return true; } - else if ((parcel.landData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0) + else if ((parcel.LandData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0) { - if (part.OwnerID == parcel.landData.OwnerID - || (parcel.landData.IsGroupOwned && part.GroupID == parcel.landData.GroupID) + if (part.OwnerID == parcel.LandData.OwnerID + || (parcel.LandData.IsGroupOwned && part.GroupID == parcel.LandData.GroupID) || Permissions.IsGod(part.OwnerID)) { return true; @@ -3899,7 +3899,7 @@ namespace OpenSim.Region.Framework.Scenes } else { - if (part.OwnerID == parcel.landData.OwnerID) + if (part.OwnerID == parcel.LandData.OwnerID) { return true; } diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 25489d8..6a10618 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -1320,15 +1320,15 @@ namespace OpenSim.Region.Framework.Scenes ILandObject parcel = m_scene.LandChannel.GetLandObject( m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y); - if (parcel != null && parcel.landData != null && - parcel.landData.OtherCleanTime != 0) + if (parcel != null && parcel.LandData != null && + parcel.LandData.OtherCleanTime != 0) { - if (parcel.landData.OwnerID != OwnerID && - (parcel.landData.GroupID != GroupID || - parcel.landData.GroupID == UUID.Zero)) + if (parcel.LandData.OwnerID != OwnerID && + (parcel.LandData.GroupID != GroupID || + parcel.LandData.GroupID == UUID.Zero)) { if ((DateTime.Now - RootPart.Rezzed).TotalMinutes > - parcel.landData.OtherCleanTime) + parcel.LandData.OtherCleanTime) { DetachFromBackup(); m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); -- cgit v1.1