diff options
Diffstat (limited to '')
5 files changed, 129 insertions, 20 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs new file mode 100644 index 0000000..bd22155 --- /dev/null +++ b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs | |||
@@ -0,0 +1,112 @@ | |||
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; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Diagnostics; | ||
32 | using System.Reflection; | ||
33 | using System.Text; | ||
34 | using log4net; | ||
35 | using Nini.Config; | ||
36 | using OpenMetaverse; | ||
37 | using OpenMetaverse.StructuredData; | ||
38 | using OpenMetaverse.Messages.Linden; | ||
39 | using Mono.Addins; | ||
40 | using OpenSim.Framework; | ||
41 | using OpenSim.Framework.Capabilities; | ||
42 | using OpenSim.Framework.Console; | ||
43 | using OpenSim.Framework.Servers; | ||
44 | using OpenSim.Framework.Servers.HttpServer; | ||
45 | using OpenSim.Region.CoreModules.Framework.InterfaceCommander; | ||
46 | using OpenSim.Region.Framework.Interfaces; | ||
47 | using OpenSim.Region.Framework.Scenes; | ||
48 | using OpenSim.Region.Physics.Manager; | ||
49 | using OpenSim.Services.Interfaces; | ||
50 | using Caps = OpenSim.Framework.Capabilities.Caps; | ||
51 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
52 | |||
53 | namespace OpenSim.Region.CoreModules.World.Land | ||
54 | { | ||
55 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DwellModule")] | ||
56 | public class DwellModule : IDwellModule, INonSharedRegionModule | ||
57 | { | ||
58 | private Scene m_scene; | ||
59 | |||
60 | public Type ReplaceableInterface | ||
61 | { | ||
62 | get { return typeof(IDwellModule); } | ||
63 | } | ||
64 | |||
65 | public string Name | ||
66 | { | ||
67 | get { return "DwellModule"; } | ||
68 | } | ||
69 | |||
70 | public void Initialise(IConfigSource source) | ||
71 | { | ||
72 | } | ||
73 | |||
74 | public void AddRegion(Scene scene) | ||
75 | { | ||
76 | m_scene = scene; | ||
77 | |||
78 | m_scene.EventManager.OnNewClient += OnNewClient; | ||
79 | } | ||
80 | |||
81 | public void RegionLoaded(Scene scene) | ||
82 | { | ||
83 | } | ||
84 | |||
85 | public void RemoveRegion(Scene scene) | ||
86 | { | ||
87 | } | ||
88 | |||
89 | public void Close() | ||
90 | { | ||
91 | } | ||
92 | |||
93 | public void OnNewClient(IClientAPI client) | ||
94 | { | ||
95 | client.OnParcelDwellRequest += ClientOnParcelDwellRequest; | ||
96 | } | ||
97 | |||
98 | private void ClientOnParcelDwellRequest(int localID, IClientAPI client) | ||
99 | { | ||
100 | ILandObject parcel = m_scene.LandChannel.GetLandObject(localID); | ||
101 | if (parcel == null) | ||
102 | return; | ||
103 | |||
104 | client.SendParcelDwellReply(localID, parcel.LandData.GlobalID, parcel.LandData.Dwell); | ||
105 | } | ||
106 | |||
107 | public int GetDwell(UUID parcelID) | ||
108 | { | ||
109 | return 0; | ||
110 | } | ||
111 | } | ||
112 | } | ||
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 95edf62..7149aad 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -36,6 +36,7 @@ using Nini.Config; | |||
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenMetaverse.StructuredData; | 37 | using OpenMetaverse.StructuredData; |
38 | using OpenMetaverse.Messages.Linden; | 38 | using OpenMetaverse.Messages.Linden; |
39 | using Mono.Addins; | ||
39 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Capabilities; | 41 | using OpenSim.Framework.Capabilities; |
41 | using OpenSim.Framework.Console; | 42 | using OpenSim.Framework.Console; |
@@ -60,6 +61,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
60 | public byte RegionAccess; | 61 | public byte RegionAccess; |
61 | } | 62 | } |
62 | 63 | ||
64 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LandManagementModule")] | ||
63 | public class LandManagementModule : INonSharedRegionModule | 65 | public class LandManagementModule : INonSharedRegionModule |
64 | { | 66 | { |
65 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 67 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -207,7 +209,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
207 | client.OnParcelInfoRequest += ClientOnParcelInfoRequest; | 209 | client.OnParcelInfoRequest += ClientOnParcelInfoRequest; |
208 | client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup; | 210 | client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup; |
209 | client.OnPreAgentUpdate += ClientOnPreAgentUpdate; | 211 | client.OnPreAgentUpdate += ClientOnPreAgentUpdate; |
210 | client.OnParcelDwellRequest += ClientOnParcelDwellRequest; | ||
211 | 212 | ||
212 | EntityBase presenceEntity; | 213 | EntityBase presenceEntity; |
213 | if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence) | 214 | if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence) |
@@ -799,17 +800,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
799 | } | 800 | } |
800 | } | 801 | } |
801 | 802 | ||
802 | private void ClientOnParcelDwellRequest(int localID, IClientAPI client) | ||
803 | { | ||
804 | ILandObject parcel = null; | ||
805 | lock (m_landList) | ||
806 | { | ||
807 | if (!m_landList.TryGetValue(localID, out parcel)) | ||
808 | return; | ||
809 | } | ||
810 | client.SendParcelDwellReply(localID, parcel.LandData.GlobalID, parcel.LandData.Dwell); | ||
811 | } | ||
812 | |||
813 | #endregion | 803 | #endregion |
814 | 804 | ||
815 | #region Parcel Modification | 805 | #region Parcel Modification |
@@ -962,6 +952,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
962 | ILandObject newLand = startLandObject.Copy(); | 952 | ILandObject newLand = startLandObject.Copy(); |
963 | newLand.LandData.Name = newLand.LandData.Name; | 953 | newLand.LandData.Name = newLand.LandData.Name; |
964 | newLand.LandData.GlobalID = UUID.Random(); | 954 | newLand.LandData.GlobalID = UUID.Random(); |
955 | newLand.LandData.Dwell = 0; | ||
965 | 956 | ||
966 | newLand.SetLandBitmap(newLand.GetSquareLandBitmap(start_x, start_y, end_x, end_y)); | 957 | newLand.SetLandBitmap(newLand.GetSquareLandBitmap(start_x, start_y, end_x, end_y)); |
967 | 958 | ||
@@ -1387,10 +1378,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1387 | 1378 | ||
1388 | public void EventManagerOnIncomingLandDataFromStorage(List<LandData> data) | 1379 | public void EventManagerOnIncomingLandDataFromStorage(List<LandData> data) |
1389 | { | 1380 | { |
1381 | // m_log.DebugFormat( | ||
1382 | // "[LAND MANAGMENT MODULE]: Processing {0} incoming parcels on {1}", data.Count, m_scene.Name); | ||
1383 | |||
1390 | for (int i = 0; i < data.Count; i++) | 1384 | for (int i = 0; i < data.Count; i++) |
1391 | { | ||
1392 | IncomingLandObjectFromStorage(data[i]); | 1385 | IncomingLandObjectFromStorage(data[i]); |
1393 | } | ||
1394 | } | 1386 | } |
1395 | 1387 | ||
1396 | public void IncomingLandObjectFromStorage(LandData data) | 1388 | public void IncomingLandObjectFromStorage(LandData data) |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 8829f27..5969d45 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -727,9 +727,10 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
727 | int ty = min_y * 4; | 727 | int ty = min_y * 4; |
728 | if (ty > ((int)Constants.RegionSize - 1)) | 728 | if (ty > ((int)Constants.RegionSize - 1)) |
729 | ty = ((int)Constants.RegionSize - 1); | 729 | ty = ((int)Constants.RegionSize - 1); |
730 | |||
730 | LandData.AABBMin = | 731 | LandData.AABBMin = |
731 | new Vector3((float) (min_x * 4), (float) (min_y * 4), | 732 | new Vector3( |
732 | (float) m_scene.Heightmap[tx, ty]); | 733 | (float)(min_x * 4), (float)(min_y * 4), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0); |
733 | 734 | ||
734 | tx = max_x * 4; | 735 | tx = max_x * 4; |
735 | if (tx > ((int)Constants.RegionSize - 1)) | 736 | if (tx > ((int)Constants.RegionSize - 1)) |
@@ -737,9 +738,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
737 | ty = max_y * 4; | 738 | ty = max_y * 4; |
738 | if (ty > ((int)Constants.RegionSize - 1)) | 739 | if (ty > ((int)Constants.RegionSize - 1)) |
739 | ty = ((int)Constants.RegionSize - 1); | 740 | ty = ((int)Constants.RegionSize - 1); |
740 | LandData.AABBMax = | 741 | |
741 | new Vector3((float) (max_x * 4), (float) (max_y * 4), | 742 | LandData.AABBMax |
742 | (float) m_scene.Heightmap[tx, ty]); | 743 | = new Vector3( |
744 | (float)(max_x * 4), (float)(max_y * 4), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0); | ||
745 | |||
743 | LandData.Area = tempArea; | 746 | LandData.Area = tempArea; |
744 | } | 747 | } |
745 | 748 | ||
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs index 665875f..f9cc0cf 100644 --- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs | |||
@@ -34,6 +34,7 @@ using log4net; | |||
34 | using Nini.Config; | 34 | using Nini.Config; |
35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using Mono.Addins; | ||
37 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Services.Interfaces; | 40 | using OpenSim.Services.Interfaces; |
@@ -49,6 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
49 | public Dictionary <UUID, int> Users = new Dictionary <UUID, int>(); | 50 | public Dictionary <UUID, int> Users = new Dictionary <UUID, int>(); |
50 | } | 51 | } |
51 | 52 | ||
53 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "PrimCountModule")] | ||
52 | public class PrimCountModule : IPrimCountModule, INonSharedRegionModule | 54 | public class PrimCountModule : IPrimCountModule, INonSharedRegionModule |
53 | { | 55 | { |
54 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 56 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs index b5ee4d2..14eca42 100644 --- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs +++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs | |||
@@ -41,7 +41,7 @@ using OpenSim.Tests.Common.Mock; | |||
41 | namespace OpenSim.Region.CoreModules.World.Land.Tests | 41 | namespace OpenSim.Region.CoreModules.World.Land.Tests |
42 | { | 42 | { |
43 | [TestFixture] | 43 | [TestFixture] |
44 | public class PrimCountModuleTests | 44 | public class PrimCountModuleTests : OpenSimTestCase |
45 | { | 45 | { |
46 | protected UUID m_userId = new UUID("00000000-0000-0000-0000-100000000000"); | 46 | protected UUID m_userId = new UUID("00000000-0000-0000-0000-100000000000"); |
47 | protected UUID m_groupId = new UUID("00000000-0000-0000-8888-000000000000"); | 47 | protected UUID m_groupId = new UUID("00000000-0000-0000-8888-000000000000"); |