OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix remote requests for dwell, so dwell module still called

0.9.0-post-fixes
UbitUmarov 2017-05-14 04:17:48 +01:00
parent cb21caae77
commit 9ab8ce1404
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -3111,10 +3111,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y) public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y)
{ {
float dwell = 0.0f;
IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>();
if (dwellModule != null)
dwell = dwellModule.GetDwell(land);
ParcelInfoReplyPacket reply = (ParcelInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelInfoReply); ParcelInfoReplyPacket reply = (ParcelInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelInfoReply);
reply.AgentData.AgentID = m_agentId; reply.AgentData.AgentID = m_agentId;
reply.Data.ParcelID = parcelID; reply.Data.ParcelID = parcelID;
@ -3141,7 +3137,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
reply.Data.GlobalZ = pos.Z; reply.Data.GlobalZ = pos.Z;
reply.Data.SimName = Utils.StringToBytes(info.RegionName); reply.Data.SimName = Utils.StringToBytes(info.RegionName);
reply.Data.SnapshotID = land.SnapshotID; reply.Data.SnapshotID = land.SnapshotID;
reply.Data.Dwell = dwell; reply.Data.Dwell = land.Dwell;
reply.Data.SalePrice = land.SalePrice; reply.Data.SalePrice = land.SalePrice;
reply.Data.AuctionID = (int)land.AuctionID; reply.Data.AuctionID = (int)land.AuctionID;

6
OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
View File

@ -151,7 +151,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
x = rx - s.RegionInfo.WorldLocX; x = rx - s.RegionInfo.WorldLocX;
y = ry - s.RegionInfo.WorldLocY; y = ry - s.RegionInfo.WorldLocY;
regionAccess = s.RegionInfo.AccessLevel; regionAccess = s.RegionInfo.AccessLevel;
return s.GetLandData(x, y); LandData land = s.GetLandData(x, y);
IDwellModule dwellModule = s.RequestModuleInterface<IDwellModule>();
if (dwellModule != null)
land.Dwell = dwellModule.GetDwell(land);
return land;
} }
} }
m_log.DebugFormat("[LAND IN CONNECTOR]: region handle {0} not found", regionHandle); m_log.DebugFormat("[LAND IN CONNECTOR]: region handle {0} not found", regionHandle);

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
View File

@ -143,6 +143,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
{ {
LandData land = s.GetLandData(x, y); LandData land = s.GetLandData(x, y);
regionAccess = s.RegionInfo.AccessLevel; regionAccess = s.RegionInfo.AccessLevel;
IDwellModule dwellModule = s.RequestModuleInterface<IDwellModule>();
if (dwellModule != null)
land.Dwell = dwellModule.GetDwell(land);
return land; return land;
} }
} }

3
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -1948,6 +1948,9 @@ namespace OpenSim.Region.CoreModules.World.Land
if (data.RegionHandle == m_scene.RegionInfo.RegionHandle) if (data.RegionHandle == m_scene.RegionInfo.RegionHandle)
{ {
info = new GridRegion(m_scene.RegionInfo); info = new GridRegion(m_scene.RegionInfo);
IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>();
if (dwellModule != null)
data.LandData.Dwell = dwellModule.GetDwell(data.LandData);
} }
else else
{ {

1
OpenSim/Server/Handlers/Land/LandHandlers.cs
View File

@ -85,6 +85,7 @@ namespace OpenSim.Server.Handlers.Land
hash["SnapshotID"] = landData.SnapshotID.ToString(); hash["SnapshotID"] = landData.SnapshotID.ToString();
hash["UserLocation"] = landData.UserLocation.ToString(); hash["UserLocation"] = landData.UserLocation.ToString();
hash["RegionAccess"] = regionAccess.ToString(); hash["RegionAccess"] = regionAccess.ToString();
hash["Dwell"] = landData.Dwell.ToString();
} }
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();

2
OpenSim/Services/Connectors/Land/LandServicesConnector.cs
View File

@ -117,6 +117,8 @@ namespace OpenSim.Services.Connectors
landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]); landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]);
if (hash["RegionAccess"] != null) if (hash["RegionAccess"] != null)
regionAccess = (byte)Convert.ToInt32((string)hash["RegionAccess"]); regionAccess = (byte)Convert.ToInt32((string)hash["RegionAccess"]);
if(hash["Dwell"] != null)
landData.Dwell = Convert.ToSingle((string)hash["Dwell"]);
m_log.DebugFormat("[LAND CONNECTOR]: Got land data for parcel {0}", landData.Name); m_log.DebugFormat("[LAND CONNECTOR]: Got land data for parcel {0}", landData.Name);
} }
catch (Exception e) catch (Exception e)