diff options
author | Justin Clark-Casey (justincc) | 2011-03-25 23:05:51 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-03-25 23:05:51 +0000 |
commit | 6ae04448f73afdca791ea185fdc0e9c062dea87b (patch) | |
tree | 704c7f3722ae802543c9b0d01bd704ca33f4f720 /OpenSim/Region/Framework/Interfaces | |
parent | Add ILandObject.IPrimCounts for the new prim count module. (diff) | |
download | opensim-SC_OLD-6ae04448f73afdca791ea185fdc0e9c062dea87b.zip opensim-SC_OLD-6ae04448f73afdca791ea185fdc0e9c062dea87b.tar.gz opensim-SC_OLD-6ae04448f73afdca791ea185fdc0e9c062dea87b.tar.bz2 opensim-SC_OLD-6ae04448f73afdca791ea185fdc0e9c062dea87b.tar.xz |
Start using IPrimCounts populated by PrimCountModule instead of LandData counts populated by LandManagementModule.
In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci
Counts are showing odd behaviour at the moment, this will be addressed shortly.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/ILandChannel.cs (renamed from OpenSim/Region/Framework/Interfaces/ILandChannel.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ILandObject.cs | 117 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IPrimCountModule.cs | 16 |
3 files changed, 1 insertions, 132 deletions
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/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 | } | ||