Merge branch 'master' into vehicles

4 files changed, 70 insertions, 63 deletions

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<UUID> createAccessListArrayByFlag(AccessList flag);
-        void sendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client);
-        void updateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> 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<UUID> CreateAccessListArrayByFlag(AccessList flag);
+        void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client);
+        void UpdateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> 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<UUID> 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<UUID> 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);
 
         /// <summary>
         /// 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 9db2240..c06a58f 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 9f44f92..be8a6c9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1327,15 +1327,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());
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index b3d10df..709cca2 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -94,10 +94,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             }
 
             // root part should have no offset position or rotation
-            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity);
+            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity, 
+                "root part should have no offset position or rotation");
 
             // offset position should be root part position - part2.absolute position.
-            Assert.That(part2.OffsetPosition == new Vector3(-10, -10, -10));
+            Assert.That(part2.OffsetPosition == new Vector3(-10, -10, -10),
+                "offset position should be root part position - part2.absolute position.");
 
             float roll = 0;
             float pitch = 0;
@@ -116,7 +118,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             if (debugtest)
                 m_log.Debug(rotEuler2);
 
-            Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f));
+            Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f),
+                "Not exactly sure what this is asserting...");
 
             // Delink part 2
             grp1.DelinkFromGroup(part2.LocalId);
@@ -125,7 +128,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 m_log.Debug("Group2: Prim2: OffsetPosition:" + part2.AbsolutePosition + ", OffsetRotation:" + part2.RotationOffset);
 
             Assert.That(grp1.Children.Count, Is.EqualTo(1), "Group 1 still contained part2 after delink.");
-            Assert.That(part2.AbsolutePosition == Vector3.Zero);
+            Assert.That(part2.AbsolutePosition == Vector3.Zero, "The absolute position should be zero");
         }
 
         [Test]
@@ -175,10 +178,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             grp3.LinkToGroup(grp4);
             
             // At this point we should have 4 parts total in two groups.
-            Assert.That(grp1.Children.Count == 2);
+            Assert.That(grp1.Children.Count == 2, "Group1 children count should be 2");
             Assert.That(grp2.IsDeleted, "Group 2 was not registered as deleted after link.");
             Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained parts after delink.");
-            Assert.That(grp3.Children.Count == 2);
+            Assert.That(grp3.Children.Count == 2, "Group3 children count should be 2");
             Assert.That(grp4.IsDeleted, "Group 4 was not registered as deleted after link.");
             Assert.That(grp4.Children.Count, Is.EqualTo(0), "Group 4 still contained parts after delink.");
             
@@ -201,10 +204,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             grp3.RootPart.UpdateFlag = 0;
 
             // root part should have no offset position or rotation
-            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity);
+            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity,
+                "root part should have no offset position or rotation (again)");
 
             // offset position should be root part position - part2.absolute position.
-            Assert.That(part2.OffsetPosition == new Vector3(-10, -10, -10));
+            Assert.That(part2.OffsetPosition == new Vector3(-10, -10, -10),
+                "offset position should be root part position - part2.absolute position (again)");
 
             float roll = 0;
             float pitch = 0;
@@ -223,7 +228,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             if (debugtest)
                 m_log.Debug(rotEuler2);
 
-            Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f));
+            Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f),
+                "Not sure what this assertion is all about...");
 
             // Now we're linking the first group to the third group.  This will make the first group child parts of the third one.
             grp3.LinkToGroup(grp1);
@@ -246,13 +252,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 m_log.Debug("Group3: Prim2: OffsetPosition:" + part4.OffsetPosition + ", OffsetRotation:" + part4.RotationOffset);
             }
 
-            Assert.That(part2.AbsolutePosition == Vector3.Zero);
-            Assert.That(part4.OffsetPosition == new Vector3(20, 20, 20));
+            Assert.That(part2.AbsolutePosition == Vector3.Zero, "Badness 1");
+            Assert.That(part4.OffsetPosition == new Vector3(20, 20, 20), "Badness 2");
             Quaternion compareQuaternion = new Quaternion(0, 0.7071068f, 0, 0.7071068f);
             Assert.That((part4.RotationOffset.X - compareQuaternion.X < 0.00003) 
                 && (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003) 
                 && (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003) 
-                && (part4.RotationOffset.W - compareQuaternion.W < 0.00003));
+                && (part4.RotationOffset.W - compareQuaternion.W < 0.00003),
+                "Badness 3");
         }
     }
 }