diff options
author | lbsa71 | 2009-03-10 12:11:19 +0000 |
---|---|---|
committer | lbsa71 | 2009-03-10 12:11:19 +0000 |
commit | 0df0258087e18757a77514ac4cba8a50e01b27d5 (patch) | |
tree | 7896a546e9782c105f7bcbfa07cd7df0d5407929 /OpenSim/Data | |
parent | * Re-aligned CustomiseResponse function for imminent up-pulling (diff) | |
download | opensim-SC_OLD-0df0258087e18757a77514ac4cba8a50e01b27d5.zip opensim-SC_OLD-0df0258087e18757a77514ac4cba8a50e01b27d5.tar.gz opensim-SC_OLD-0df0258087e18757a77514ac4cba8a50e01b27d5.tar.bz2 opensim-SC_OLD-0df0258087e18757a77514ac4cba8a50e01b27d5.tar.xz |
*** POTENTIAL BREAKAGE ***
* Finally got to the point where I could pull up the CustomiseResponse function. Major de-duplication.
* Introduced FromRegionInfo on RegionProfileData
* This revision needs both grid and standalone testing galore.
Work in progress!
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/RegionProfileData.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs index 5476233..26b65de 100644 --- a/OpenSim/Data/RegionProfileData.cs +++ b/OpenSim/Data/RegionProfileData.cs | |||
@@ -285,6 +285,14 @@ namespace OpenSim.Data | |||
285 | return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort); | 285 | return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort); |
286 | } | 286 | } |
287 | 287 | ||
288 | public static RegionProfileData FromRegionInfo( RegionInfo regionInfo ) | ||
289 | { | ||
290 | return Create(regionInfo.RegionID, regionInfo.RegionName, regionInfo.RegionLocX, | ||
291 | regionInfo.RegionLocY, regionInfo.ExternalHostName, | ||
292 | (uint) regionInfo.ExternalEndPoint.Port, regionInfo.HttpPort, regionInfo.RemotingPort, | ||
293 | regionInfo.ServerURI); | ||
294 | } | ||
295 | |||
288 | public static RegionProfileData Create(UUID regionID, string regionName, uint locX, uint locY, string externalHostName, uint regionPort, uint httpPort, uint remotingPort, string serverUri) | 296 | public static RegionProfileData Create(UUID regionID, string regionName, uint locX, uint locY, string externalHostName, uint regionPort, uint httpPort, uint remotingPort, string serverUri) |
289 | { | 297 | { |
290 | RegionProfileData regionProfile; | 298 | RegionProfileData regionProfile; |