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/CoreModules | |
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/CoreModules')
3 files changed, 12 insertions, 1 deletions
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 | { |