diff options
author | UbitUmarov | 2017-05-14 04:17:48 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-14 04:17:48 +0100 |
commit | 9ab8ce1404259557cb1412af5b3296ced7228d5b (patch) | |
tree | a595e27699843a4a0aa09696abd84526650d97d6 /OpenSim/Region | |
parent | fix some issue on parcels loading and make parcels dwell show something. Reso... (diff) | |
download | opensim-SC_OLD-9ab8ce1404259557cb1412af5b3296ced7228d5b.zip opensim-SC_OLD-9ab8ce1404259557cb1412af5b3296ced7228d5b.tar.gz opensim-SC_OLD-9ab8ce1404259557cb1412af5b3296ced7228d5b.tar.bz2 opensim-SC_OLD-9ab8ce1404259557cb1412af5b3296ced7228d5b.tar.xz |
fix remote requests for dwell, so dwell module still called
Diffstat (limited to 'OpenSim/Region')
4 files changed, 13 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 6a3960d..298c933 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -3111,10 +3111,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3111 | 3111 | ||
3112 | public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y) | 3112 | public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y) |
3113 | { | 3113 | { |
3114 | float dwell = 0.0f; | ||
3115 | IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>(); | ||
3116 | if (dwellModule != null) | ||
3117 | dwell = dwellModule.GetDwell(land); | ||
3118 | ParcelInfoReplyPacket reply = (ParcelInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelInfoReply); | 3114 | ParcelInfoReplyPacket reply = (ParcelInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelInfoReply); |
3119 | reply.AgentData.AgentID = m_agentId; | 3115 | reply.AgentData.AgentID = m_agentId; |
3120 | reply.Data.ParcelID = parcelID; | 3116 | reply.Data.ParcelID = parcelID; |
@@ -3141,7 +3137,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3141 | reply.Data.GlobalZ = pos.Z; | 3137 | reply.Data.GlobalZ = pos.Z; |
3142 | reply.Data.SimName = Utils.StringToBytes(info.RegionName); | 3138 | reply.Data.SimName = Utils.StringToBytes(info.RegionName); |
3143 | reply.Data.SnapshotID = land.SnapshotID; | 3139 | reply.Data.SnapshotID = land.SnapshotID; |
3144 | reply.Data.Dwell = dwell; | 3140 | reply.Data.Dwell = land.Dwell; |
3145 | reply.Data.SalePrice = land.SalePrice; | 3141 | reply.Data.SalePrice = land.SalePrice; |
3146 | reply.Data.AuctionID = (int)land.AuctionID; | 3142 | reply.Data.AuctionID = (int)land.AuctionID; |
3147 | 3143 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs index 21483c5..fb8c306 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs | |||
@@ -151,7 +151,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land | |||
151 | x = rx - s.RegionInfo.WorldLocX; | 151 | x = rx - s.RegionInfo.WorldLocX; |
152 | y = ry - s.RegionInfo.WorldLocY; | 152 | y = ry - s.RegionInfo.WorldLocY; |
153 | regionAccess = s.RegionInfo.AccessLevel; | 153 | regionAccess = s.RegionInfo.AccessLevel; |
154 | return s.GetLandData(x, y); | 154 | LandData land = s.GetLandData(x, y); |
155 | IDwellModule dwellModule = s.RequestModuleInterface<IDwellModule>(); | ||
156 | if (dwellModule != null) | ||
157 | land.Dwell = dwellModule.GetDwell(land); | ||
158 | return land; | ||
155 | } | 159 | } |
156 | } | 160 | } |
157 | m_log.DebugFormat("[LAND IN CONNECTOR]: region handle {0} not found", regionHandle); | 161 | m_log.DebugFormat("[LAND IN CONNECTOR]: region handle {0} not found", regionHandle); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs index cad2061..8baf41a 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs | |||
@@ -143,6 +143,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land | |||
143 | { | 143 | { |
144 | LandData land = s.GetLandData(x, y); | 144 | LandData land = s.GetLandData(x, y); |
145 | regionAccess = s.RegionInfo.AccessLevel; | 145 | regionAccess = s.RegionInfo.AccessLevel; |
146 | IDwellModule dwellModule = s.RequestModuleInterface<IDwellModule>(); | ||
147 | if (dwellModule != null) | ||
148 | land.Dwell = dwellModule.GetDwell(land); | ||
149 | |||
146 | return land; | 150 | return land; |
147 | } | 151 | } |
148 | } | 152 | } |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index ce982a2..6f32a77 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1948,6 +1948,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1948 | if (data.RegionHandle == m_scene.RegionInfo.RegionHandle) | 1948 | if (data.RegionHandle == m_scene.RegionInfo.RegionHandle) |
1949 | { | 1949 | { |
1950 | info = new GridRegion(m_scene.RegionInfo); | 1950 | info = new GridRegion(m_scene.RegionInfo); |
1951 | IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>(); | ||
1952 | if (dwellModule != null) | ||
1953 | data.LandData.Dwell = dwellModule.GetDwell(data.LandData); | ||
1951 | } | 1954 | } |
1952 | else | 1955 | else |
1953 | { | 1956 | { |