ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 22:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Another stab at refactoring up the CustomiseResponse function. Two fixes:

Browse Source 
* Sometimes, null is a valid return value to indicate 'none found'. doh.
  * Sometimes, the Grid server does not send simURI - this you need to reconstruct yourself. Euw.

(I believe) this solves mantis issue #3287
This commit is contained in:
lbsa71
2009-03-12 10:50:59 +00:00
parent 7b2977d625
commit 33f511ee4b
6 changed files with 218 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Data/RegionProfileData.cs
View File

@@ -282,7 +282,20 @@ namespace OpenSim.Data
public RegionInfo ToRegionInfo( )
{
return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort);
return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort, serverURI );
}
public static RegionProfileData FromRegionInfo( RegionInfo regionInfo )
{
if( regionInfo == null )
{
return null;
}
return Create(regionInfo.RegionID, regionInfo.RegionName, regionInfo.RegionLocX,
regionInfo.RegionLocY, regionInfo.ExternalHostName,
(uint) regionInfo.ExternalEndPoint.Port, regionInfo.HttpPort, regionInfo.RemotingPort,
regionInfo.ServerURI);
}
public static RegionProfileData Create(UUID regionID, string regionName, uint locX, uint locY, string externalHostName, uint regionPort, uint httpPort, uint remotingPort, string serverUri)