From cc8897fcebdc9d3e875c9bf745ecb77678a776e9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 26 Mar 2011 00:34:49 +0000
Subject: Add test for PCM taint. This currently fails due to unexpected
behaviour of SceneGraph.ForEachSOG(). This will be corrected soon.
Also adds lots of temproarily debug logging
---
OpenSim/Framework/ILandObject.cs | 112 +++++++++++++++++++++++++++++++++++++++
1 file changed, 112 insertions(+)
create mode 100644 OpenSim/Framework/ILandObject.cs
(limited to 'OpenSim/Framework/ILandObject.cs')
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
new file mode 100644
index 0000000..931e24a
--- /dev/null
+++ b/OpenSim/Framework/ILandObject.cs
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Collections.Generic;
+using OpenMetaverse;
+
+namespace OpenSim.Framework
+{
+ public delegate int overrideParcelMaxPrimCountDelegate(ILandObject obj);
+ public delegate int overrideSimulatorMaxPrimCountDelegate(ILandObject obj);
+
+ public interface ILandObject
+ {
+ int GetParcelMaxPrimCount(ILandObject thisObject);
+ int GetSimulatorMaxPrimCount(ILandObject thisObject);
+ int GetPrimsFree();
+
+ LandData LandData { get; set; }
+ bool[,] LandBitmap { get; set; }
+ UUID RegionUUID { get; }
+
+ ///
+ /// Prim counts for this land object.
+ ///
+ IPrimCounts PrimCounts { get; set; }
+
+ ///
+ /// The start point for the land object. This is the western-most point as one scans land working from
+ /// north to south.
+ ///
+ Vector3 StartPoint { get; }
+
+ ///
+ /// The end point for the land object. This is the eastern-most point as one scans land working from
+ /// south to north.
+ ///
+ Vector3 EndPoint { get; }
+
+ bool ContainsPoint(int x, int y);
+
+ ILandObject Copy();
+
+ 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);
+ void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client);
+ List CreateAccessListArrayByFlag(AccessList flag);
+ void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client);
+ void UpdateAccessList(uint flags, UUID transactionID, int sequenceID, int sections, 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 ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client);
+ void ResetLandPrimCounts();
+ void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area);
+
+ void DeedToGroup(UUID groupID);
+
+ void SetParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel);
+ void SetSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel);
+
+ ///
+ /// Set the media url for this land parcel
+ ///
+ ///
+ void SetMediaUrl(string url);
+
+ ///
+ /// Set the music url for this land parcel
+ ///
+ ///
+ void SetMusicUrl(string url);
+ }
+}
--
cgit v1.1
From 0e465da187c93e7ff21f91742f75ee9f3b76b04e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 5 Apr 2011 21:25:54 +0100
Subject: remove now unused individual LandData prim counts.
However, the calls to the land management module to record prims need to remain, since they were also being used to return owner object lists, etc.
This is probably why prim counts were being done there in the first place.
---
OpenSim/Framework/ILandObject.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Framework/ILandObject.cs')
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index 931e24a..98ea01e 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Framework
void SendForceObjectSelect(int local_id, int request_type, List returnIDs, IClientAPI remote_client);
void SendLandObjectOwners(IClientAPI remote_client);
void ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client);
- void ResetLandPrimCounts();
+ void ResetOverMeRecord();
void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area);
void DeedToGroup(UUID groupID);
--
cgit v1.1
From fa202a05e914395d5a1facf8bdadb6a553516bfe Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 6 Apr 2011 17:19:31 +0100
Subject: Add method doc to some land bitmap methods in ILandObject.
Also changes prim count tests to use the correct upper region bounds, though the method actually ignores the overage.
---
OpenSim/Framework/ILandObject.cs | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
(limited to 'OpenSim/Framework/ILandObject.cs')
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index 98ea01e..02775e9 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -82,8 +82,26 @@ namespace OpenSim.Framework
void ForceUpdateLandInfo();
void SetLandBitmap(bool[,] bitmap);
+ ///
+ /// Get a land bitmap that would cover an entire region.
+ ///
+ /// The bitmap created.
bool[,] BasicFullRegionLandBitmap();
+
+ ///
+ /// Create a square land bitmap.
+ ///
+ ///
+ /// Land co-ordinates are zero indexed. At the moment, the smallest parcel of land is 4m x 4m, so if the
+ /// region is 256 x 256m (the SL size), the largest land parcel starts at (0,0) and ends at (63,63).
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// The bitmap created.
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);
--
cgit v1.1
From 63533412f882fd55c0c40989d97f8a8262bc4e3c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 6 Apr 2011 18:57:50 +0100
Subject: Improve previous ILandObject method doc.
For test code, take a part name prefix when creating objects, so that these can be more easily identified in the logs
---
OpenSim/Framework/ILandObject.cs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Framework/ILandObject.cs')
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index 02775e9..5a55b02 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -92,8 +92,12 @@ namespace OpenSim.Framework
/// Create a square land bitmap.
///
///
- /// Land co-ordinates are zero indexed. At the moment, the smallest parcel of land is 4m x 4m, so if the
- /// region is 256 x 256m (the SL size), the largest land parcel starts at (0,0) and ends at (63,63).
+ /// Land co-ordinates are zero indexed. The inputs are treated as points. So if you want to create a bitmap
+ /// that covers an entire 256 x 256m region apart from a strip of land on the east, then you would need to
+ /// specify start_x = 0, start_y = 0, end_x = 252 (or anything up to 255), end_y = 256.
+ ///
+ /// At the moment, the smallest parcel of land is 4m x 4m, so if the
+ /// region is 256 x 256m (the SL size), the bitmap returned will start at (0,0) and end at (63,63).
///
///
///
--
cgit v1.1