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

Update svn properties, minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-08-17 02:31:45 +00:00
parent 60a676251a
commit 796ccd3d37
4 changed files with 96 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
@ -1157,7 +1157,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land
{ {
// a parcel request for a parcel in another region. Ask the grid about the region // a parcel request for a parcel in another region. Ask the grid about the region
RegionInfo info = m_scene.CommsManager.GridService.RequestNeighbourInfo(regionID); RegionInfo info = m_scene.CommsManager.GridService.RequestNeighbourInfo(regionID);
if(info != null) parcelID = Util.BuildFakeParcelID(info.RegionHandle, x, y); if (info != null)
parcelID = Util.BuildFakeParcelID(info.RegionHandle, x, y);
} }
} }
} }
@ -1182,7 +1183,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land
private void handleParcelInfo(IClientAPI remoteClient, LLUUID parcelID) private void handleParcelInfo(IClientAPI remoteClient, LLUUID parcelID)
{ {
if(parcelID == LLUUID.Zero) return; if (parcelID == LLUUID.Zero)
return;
// assume we've got the parcelID we just computed in RemoteParcelRequest // assume we've got the parcelID we just computed in RemoteParcelRequest
ulong regionHandle; ulong regionHandle;
@ -1191,8 +1193,10 @@ namespace OpenSim.Region.Environment.Modules.World.Land
m_log.DebugFormat("[LAND] got parcelinfo request for regionHandle {0}, x/y {1}/{2}", regionHandle, x, y); m_log.DebugFormat("[LAND] got parcelinfo request for regionHandle {0}, x/y {1}/{2}", regionHandle, x, y);
LandData landData; LandData landData;
if(regionHandle == m_scene.RegionInfo.RegionHandle) landData = this.GetLandObject(x, y).landData; if (regionHandle == m_scene.RegionInfo.RegionHandle)
else landData = m_scene.CommsManager.GridService.RequestLandData(regionHandle, x, y); landData = this.GetLandObject(x, y).landData;
else
landData = m_scene.CommsManager.GridService.RequestLandData(regionHandle, x, y);
if (landData != null) if (landData != null)
{ {
@ -1200,8 +1204,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land
m_log.Debug("[LAND] got parcelinfo; sending"); m_log.Debug("[LAND] got parcelinfo; sending");
remoteClient.SendParcelInfo(m_scene.RegionInfo, landData, parcelID, x, y); remoteClient.SendParcelInfo(m_scene.RegionInfo, landData, parcelID, x, y);
} }
else m_log.Debug("[LAND] got no parcelinfo; not sending"); else
m_log.Debug("[LAND] got no parcelinfo; not sending");
} }
} }
} }

10
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -3872,9 +3872,13 @@ namespace OpenSim.Region.Environment.Scenes
public void RegionHandleRequest(IClientAPI client, LLUUID regionID) public void RegionHandleRequest(IClientAPI client, LLUUID regionID)
{ {
RegionInfo info; RegionInfo info;
if(regionID == RegionInfo.RegionID) info = RegionInfo; if (regionID == RegionInfo.RegionID)
else info = CommsManager.GridService.RequestNeighbourInfo(regionID); info = RegionInfo;
if(info != null) client.SendRegionHandle(regionID, info.RegionHandle); else
info = CommsManager.GridService.RequestNeighbourInfo(regionID);
if (info != null)
client.SendRegionHandle(regionID, info.RegionHandle);
} }