diff options
16 files changed, 89 insertions, 154 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 1d93382..93c6c98 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -1252,7 +1252,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
1252 | // Need to translate to MXP somehow | 1252 | // Need to translate to MXP somehow |
1253 | } | 1253 | } |
1254 | 1254 | ||
1255 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 1255 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
1256 | { | 1256 | { |
1257 | // Need to translate to MXP somehow | 1257 | // Need to translate to MXP somehow |
1258 | } | 1258 | } |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index f2b58d3..fc27f01 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
@@ -799,7 +799,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
799 | throw new System.NotImplementedException(); | 799 | throw new System.NotImplementedException(); |
800 | } | 800 | } |
801 | 801 | ||
802 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 802 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
803 | { | 803 | { |
804 | throw new System.NotImplementedException(); | 804 | throw new System.NotImplementedException(); |
805 | } | 805 | } |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index a6be157..5bf0b7b 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1143,7 +1143,17 @@ namespace OpenSim.Framework | |||
1143 | void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, | 1143 | void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, |
1144 | uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner); | 1144 | uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner); |
1145 | 1145 | ||
1146 | void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, | 1146 | /// <summary> |
1147 | /// Send land properties to the client. | ||
1148 | /// </summary> | ||
1149 | /// <param name="sequence_id"></param> | ||
1150 | /// <param name="snap_selection"></param> | ||
1151 | /// <param name="request_result"></param> | ||
1152 | /// <param name="lo"></param></param> | ||
1153 | /// <param name="parcelObjectCapacity">/param> | ||
1154 | /// <param name="simObjectCapacity"></param> | ||
1155 | /// <param name="regionFlags"></param> | ||
1156 | void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, | ||
1147 | float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, | 1157 | float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, |
1148 | uint regionFlags); | 1158 | uint regionFlags); |
1149 | 1159 | ||
diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Framework/ILandChannel.cs index 30bae16..30bae16 100644 --- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs +++ b/OpenSim/Framework/ILandChannel.cs | |||
diff --git a/OpenSim/Framework/IPrimCounts.cs b/OpenSim/Framework/IPrimCounts.cs new file mode 100644 index 0000000..7d362c5 --- /dev/null +++ b/OpenSim/Framework/IPrimCounts.cs | |||
@@ -0,0 +1,45 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using OpenMetaverse; | ||
29 | |||
30 | namespace OpenSim.Framework | ||
31 | { | ||
32 | public interface IPrimCounts | ||
33 | { | ||
34 | int Owner { get; } | ||
35 | int Group { get; } | ||
36 | int Others { get; } | ||
37 | int Simulator { get; } | ||
38 | IUserPrimCounts Users { get; } | ||
39 | } | ||
40 | |||
41 | public interface IUserPrimCounts | ||
42 | { | ||
43 | int this[UUID agentID] { get; } | ||
44 | } | ||
45 | } \ No newline at end of file | ||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 2c6795f..6138056 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -4272,8 +4272,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4272 | OutPacket(packet, ThrottleOutPacketType.Task); | 4272 | OutPacket(packet, ThrottleOutPacketType.Task); |
4273 | } | 4273 | } |
4274 | 4274 | ||
4275 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 4275 | public void SendLandProperties( |
4276 | int sequence_id, bool snap_selection, int request_result, ILandObject lo, | ||
4277 | float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | ||
4276 | { | 4278 | { |
4279 | LandData landData = lo.LandData; | ||
4280 | |||
4277 | ParcelPropertiesMessage updateMessage = new ParcelPropertiesMessage(); | 4281 | ParcelPropertiesMessage updateMessage = new ParcelPropertiesMessage(); |
4278 | 4282 | ||
4279 | updateMessage.AABBMax = landData.AABBMax; | 4283 | updateMessage.AABBMax = landData.AABBMax; |
@@ -4281,15 +4285,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4281 | updateMessage.Area = landData.Area; | 4285 | updateMessage.Area = landData.Area; |
4282 | updateMessage.AuctionID = landData.AuctionID; | 4286 | updateMessage.AuctionID = landData.AuctionID; |
4283 | updateMessage.AuthBuyerID = landData.AuthBuyerID; | 4287 | updateMessage.AuthBuyerID = landData.AuthBuyerID; |
4284 | |||
4285 | updateMessage.Bitmap = landData.Bitmap; | 4288 | updateMessage.Bitmap = landData.Bitmap; |
4286 | |||
4287 | updateMessage.Desc = landData.Description; | 4289 | updateMessage.Desc = landData.Description; |
4288 | updateMessage.Category = landData.Category; | 4290 | updateMessage.Category = landData.Category; |
4289 | updateMessage.ClaimDate = Util.ToDateTime(landData.ClaimDate); | 4291 | updateMessage.ClaimDate = Util.ToDateTime(landData.ClaimDate); |
4290 | updateMessage.ClaimPrice = landData.ClaimPrice; | 4292 | updateMessage.ClaimPrice = landData.ClaimPrice; |
4291 | updateMessage.GroupID = landData.GroupID; | 4293 | updateMessage.GroupID = landData.GroupID; |
4292 | updateMessage.GroupPrims = landData.GroupPrims; | ||
4293 | updateMessage.IsGroupOwned = landData.IsGroupOwned; | 4294 | updateMessage.IsGroupOwned = landData.IsGroupOwned; |
4294 | updateMessage.LandingType = (LandingType) landData.LandingType; | 4295 | updateMessage.LandingType = (LandingType) landData.LandingType; |
4295 | updateMessage.LocalID = landData.LocalID; | 4296 | updateMessage.LocalID = landData.LocalID; |
@@ -4310,9 +4311,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4310 | updateMessage.Name = landData.Name; | 4311 | updateMessage.Name = landData.Name; |
4311 | updateMessage.OtherCleanTime = landData.OtherCleanTime; | 4312 | updateMessage.OtherCleanTime = landData.OtherCleanTime; |
4312 | updateMessage.OtherCount = 0; //TODO: Unimplemented | 4313 | updateMessage.OtherCount = 0; //TODO: Unimplemented |
4313 | updateMessage.OtherPrims = landData.OtherPrims; | 4314 | updateMessage.OwnerID = landData.OwnerID; |
4314 | updateMessage.OwnerID = landData.OwnerID; | ||
4315 | updateMessage.OwnerPrims = landData.OwnerPrims; | ||
4316 | updateMessage.ParcelFlags = (ParcelFlags) landData.Flags; | 4315 | updateMessage.ParcelFlags = (ParcelFlags) landData.Flags; |
4317 | updateMessage.ParcelPrimBonus = simObjectBonusFactor; | 4316 | updateMessage.ParcelPrimBonus = simObjectBonusFactor; |
4318 | updateMessage.PassHours = landData.PassHours; | 4317 | updateMessage.PassHours = landData.PassHours; |
@@ -4327,10 +4326,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4327 | 4326 | ||
4328 | updateMessage.RentPrice = 0; | 4327 | updateMessage.RentPrice = 0; |
4329 | updateMessage.RequestResult = (ParcelResult) request_result; | 4328 | updateMessage.RequestResult = (ParcelResult) request_result; |
4330 | updateMessage.SalePrice = landData.SalePrice; | 4329 | updateMessage.SalePrice = landData.SalePrice; |
4331 | updateMessage.SelectedPrims = landData.SelectedPrims; | ||
4332 | updateMessage.SelfCount = 0; //TODO: Unimplemented | 4330 | updateMessage.SelfCount = 0; //TODO: Unimplemented |
4333 | updateMessage.SequenceID = sequence_id; | 4331 | updateMessage.SequenceID = sequence_id; |
4332 | |||
4334 | if (landData.SimwideArea > 0) | 4333 | if (landData.SimwideArea > 0) |
4335 | { | 4334 | { |
4336 | int simulatorCapacity = (int)(((float)landData.SimwideArea / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus); | 4335 | int simulatorCapacity = (int)(((float)landData.SimwideArea / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus); |
@@ -4340,12 +4339,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4340 | { | 4339 | { |
4341 | updateMessage.SimWideMaxPrims = 0; | 4340 | updateMessage.SimWideMaxPrims = 0; |
4342 | } | 4341 | } |
4343 | updateMessage.SimWideTotalPrims = landData.SimwidePrims; | 4342 | |
4344 | updateMessage.SnapSelection = snap_selection; | 4343 | updateMessage.SnapSelection = snap_selection; |
4345 | updateMessage.SnapshotID = landData.SnapshotID; | 4344 | updateMessage.SnapshotID = landData.SnapshotID; |
4346 | updateMessage.Status = (ParcelStatus) landData.Status; | 4345 | updateMessage.Status = (ParcelStatus) landData.Status; |
4347 | updateMessage.TotalPrims = landData.OwnerPrims + landData.GroupPrims + landData.OtherPrims + | ||
4348 | landData.SelectedPrims; | ||
4349 | updateMessage.UserLocation = landData.UserLocation; | 4346 | updateMessage.UserLocation = landData.UserLocation; |
4350 | updateMessage.UserLookAt = landData.UserLookAt; | 4347 | updateMessage.UserLookAt = landData.UserLookAt; |
4351 | 4348 | ||
@@ -4356,6 +4353,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4356 | updateMessage.MediaLoop = landData.MediaLoop; | 4353 | updateMessage.MediaLoop = landData.MediaLoop; |
4357 | updateMessage.ObscureMusic = landData.ObscureMusic; | 4354 | updateMessage.ObscureMusic = landData.ObscureMusic; |
4358 | updateMessage.ObscureMedia = landData.ObscureMedia; | 4355 | updateMessage.ObscureMedia = landData.ObscureMedia; |
4356 | |||
4357 | IPrimCounts pc = lo.PrimCounts; | ||
4358 | updateMessage.OwnerPrims = pc.Owner; | ||
4359 | updateMessage.GroupPrims = pc.Group; | ||
4360 | updateMessage.OtherPrims = pc.Others; | ||
4361 | updateMessage.SimWideTotalPrims = pc.Simulator; | ||
4362 | |||
4363 | // FIXME: Need to do selected prims once this is reimplemented. | ||
4364 | updateMessage.TotalPrims = pc.Owner + pc.Group + pc.Others; | ||
4365 | |||
4366 | // TODO: Need to transfer selected prims to new prim count structure. | ||
4367 | updateMessage.SelectedPrims = landData.SelectedPrims; | ||
4359 | 4368 | ||
4360 | try | 4369 | try |
4361 | { | 4370 | { |
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index a5fcb49..0babeb5 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | using OpenSim.Framework; | ||
31 | using OpenSim.Region.Framework.Interfaces; | 32 | using OpenSim.Region.Framework.Interfaces; |
32 | using OpenSim.Region.Framework.Scenes; | 33 | using OpenSim.Region.Framework.Scenes; |
33 | using OpenMetaverse; | 34 | using OpenMetaverse; |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index d0727d9..52e3718 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -805,7 +805,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
805 | ILandObject landUnderPrim = GetLandObject(position.X, position.Y); | 805 | ILandObject landUnderPrim = GetLandObject(position.X, position.Y); |
806 | if (landUnderPrim != null) | 806 | if (landUnderPrim != null) |
807 | { | 807 | { |
808 | landUnderPrim.AddPrimToCount(obj); | 808 | ((LandObject)landUnderPrim).AddPrimToCount(obj); |
809 | } | 809 | } |
810 | } | 810 | } |
811 | 811 | ||
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 749bb3d..e7bdb19 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
243 | } | 243 | } |
244 | 244 | ||
245 | remote_client.SendLandProperties(seq_id, | 245 | remote_client.SendLandProperties(seq_id, |
246 | snap_selection, request_result, LandData, | 246 | snap_selection, request_result, this, |
247 | (float)m_scene.RegionInfo.RegionSettings.ObjectBonus, | 247 | (float)m_scene.RegionInfo.RegionSettings.ObjectBonus, |
248 | GetParcelMaxPrimCount(this), | 248 | GetParcelMaxPrimCount(this), |
249 | GetSimulatorMaxPrimCount(this), regionFlags); | 249 | GetSimulatorMaxPrimCount(this), regionFlags); |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 41d6628..d939329 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -909,7 +909,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
909 | { | 909 | { |
910 | } | 910 | } |
911 | 911 | ||
912 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 912 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
913 | { | 913 | { |
914 | } | 914 | } |
915 | 915 | ||
diff --git a/OpenSim/Region/Framework/Interfaces/ILandObject.cs b/OpenSim/Region/Framework/Interfaces/ILandObject.cs deleted file mode 100644 index 9c0abde..0000000 --- a/OpenSim/Region/Framework/Interfaces/ILandObject.cs +++ /dev/null | |||
@@ -1,117 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System.Collections.Generic; | ||
29 | using OpenMetaverse; | ||
30 | using OpenSim.Framework; | ||
31 | using OpenSim.Region.Framework.Scenes; | ||
32 | |||
33 | namespace OpenSim.Region.Framework.Interfaces | ||
34 | { | ||
35 | public delegate int overrideParcelMaxPrimCountDelegate(ILandObject obj); | ||
36 | public delegate int overrideSimulatorMaxPrimCountDelegate(ILandObject obj); | ||
37 | |||
38 | public interface ILandObject | ||
39 | { | ||
40 | int GetParcelMaxPrimCount(ILandObject thisObject); | ||
41 | int GetSimulatorMaxPrimCount(ILandObject thisObject); | ||
42 | int GetPrimsFree(); | ||
43 | |||
44 | LandData LandData { get; set; } | ||
45 | bool[,] LandBitmap { get; set; } | ||
46 | UUID RegionUUID { get; } | ||
47 | |||
48 | /// <summary> | ||
49 | /// Prim counts for this land object. | ||
50 | /// </summary> | ||
51 | IPrimCounts PrimCounts { get; set; } | ||
52 | |||
53 | /// <summary> | ||
54 | /// The start point for the land object. This is the western-most point as one scans land working from | ||
55 | /// north to south. | ||
56 | /// </summary> | ||
57 | Vector3 StartPoint { get; } | ||
58 | |||
59 | /// <summary> | ||
60 | /// The end point for the land object. This is the eastern-most point as one scans land working from | ||
61 | /// south to north. | ||
62 | /// </summary> | ||
63 | Vector3 EndPoint { get; } | ||
64 | |||
65 | bool ContainsPoint(int x, int y); | ||
66 | |||
67 | ILandObject Copy(); | ||
68 | |||
69 | void SendLandUpdateToAvatarsOverMe(); | ||
70 | |||
71 | void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client); | ||
72 | void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client); | ||
73 | bool IsEitherBannedOrRestricted(UUID avatar); | ||
74 | bool IsBannedFromLand(UUID avatar); | ||
75 | bool IsRestrictedFromLand(UUID avatar); | ||
76 | void SendLandUpdateToClient(IClientAPI remote_client); | ||
77 | void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client); | ||
78 | List<UUID> CreateAccessListArrayByFlag(AccessList flag); | ||
79 | void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client); | ||
80 | void UpdateAccessList(uint flags, UUID transactionID, int sequenceID, int sections, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client); | ||
81 | void UpdateLandBitmapByteArray(); | ||
82 | void SetLandBitmapFromByteArray(); | ||
83 | bool[,] GetLandBitmap(); | ||
84 | void ForceUpdateLandInfo(); | ||
85 | void SetLandBitmap(bool[,] bitmap); | ||
86 | |||
87 | bool[,] BasicFullRegionLandBitmap(); | ||
88 | bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y); | ||
89 | bool[,] ModifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value); | ||
90 | bool[,] MergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add); | ||
91 | void SendForceObjectSelect(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client); | ||
92 | void SendLandObjectOwners(IClientAPI remote_client); | ||
93 | void ReturnObject(SceneObjectGroup obj); | ||
94 | void ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client); | ||
95 | void ResetLandPrimCounts(); | ||
96 | void AddPrimToCount(SceneObjectGroup obj); | ||
97 | void RemovePrimFromCount(SceneObjectGroup obj); | ||
98 | void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area); | ||
99 | |||
100 | void DeedToGroup(UUID groupID); | ||
101 | |||
102 | void SetParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel); | ||
103 | void SetSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel); | ||
104 | |||
105 | /// <summary> | ||
106 | /// Set the media url for this land parcel | ||
107 | /// </summary> | ||
108 | /// <param name="url"></param> | ||
109 | void SetMediaUrl(string url); | ||
110 | |||
111 | /// <summary> | ||
112 | /// Set the music url for this land parcel | ||
113 | /// </summary> | ||
114 | /// <param name="url"></param> | ||
115 | void SetMusicUrl(string url); | ||
116 | } | ||
117 | } | ||
diff --git a/OpenSim/Region/Framework/Interfaces/IPrimCountModule.cs b/OpenSim/Region/Framework/Interfaces/IPrimCountModule.cs index 65158e1..d63da2e 100644 --- a/OpenSim/Region/Framework/Interfaces/IPrimCountModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IPrimCountModule.cs | |||
@@ -38,18 +38,4 @@ namespace OpenSim.Region.Framework.Interfaces | |||
38 | 38 | ||
39 | IPrimCounts GetPrimCounts(UUID parcelID); | 39 | IPrimCounts GetPrimCounts(UUID parcelID); |
40 | } | 40 | } |
41 | 41 | } \ No newline at end of file | |
42 | public interface IPrimCounts | ||
43 | { | ||
44 | int Owner { get; } | ||
45 | int Group { get; } | ||
46 | int Others { get; } | ||
47 | int Simulator { get; } | ||
48 | IUserPrimCounts Users { get; } | ||
49 | } | ||
50 | |||
51 | public interface IUserPrimCounts | ||
52 | { | ||
53 | int this[UUID agentID] { get; } | ||
54 | } | ||
55 | } | ||
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 49382f0..821cd4b 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -1247,7 +1247,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1247 | 1247 | ||
1248 | } | 1248 | } |
1249 | 1249 | ||
1250 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 1250 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
1251 | { | 1251 | { |
1252 | 1252 | ||
1253 | } | 1253 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs index 8df020f..c898da6 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs | |||
@@ -25,6 +25,7 @@ | |||
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 | ||
28 | using OpenSim.Framework; | ||
28 | using OpenSim.Region.Framework.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
29 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
30 | 31 | ||
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 5d44aa1..96760a2 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -925,7 +925,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
925 | { | 925 | { |
926 | } | 926 | } |
927 | 927 | ||
928 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 928 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
929 | { | 929 | { |
930 | } | 930 | } |
931 | public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) | 931 | public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID) |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index ebe0a72..d1dc17f 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -957,7 +957,7 @@ namespace OpenSim.Tests.Common.Mock | |||
957 | { | 957 | { |
958 | } | 958 | } |
959 | 959 | ||
960 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 960 | public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
961 | { | 961 | { |
962 | } | 962 | } |
963 | 963 | ||