diff options
| author | Jeff Ames | 2009-03-12 15:28:30 +0000 |
|---|---|---|
| committer | Jeff Ames | 2009-03-12 15:28:30 +0000 |
| commit | fb258c5ed98a1b7b1046e7387d8f130f7a4587d3 (patch) | |
| tree | a9f953c0e08db6f3aa2fe1e3ba0a189bba474bdc /OpenSim/Data | |
| parent | * Ignored some gens (diff) | |
| download | opensim-SC-fb258c5ed98a1b7b1046e7387d8f130f7a4587d3.zip opensim-SC-fb258c5ed98a1b7b1046e7387d8f130f7a4587d3.tar.gz opensim-SC-fb258c5ed98a1b7b1046e7387d8f130f7a4587d3.tar.bz2 opensim-SC-fb258c5ed98a1b7b1046e7387d8f130f7a4587d3.tar.xz | |
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/RegionProfileData.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs index 7dd4a41..8ff2184 100644 --- a/OpenSim/Data/RegionProfileData.cs +++ b/OpenSim/Data/RegionProfileData.cs | |||
| @@ -280,22 +280,22 @@ namespace OpenSim.Data | |||
| 280 | set { originUUID = value; } | 280 | set { originUUID = value; } |
| 281 | } | 281 | } |
| 282 | 282 | ||
| 283 | public RegionInfo ToRegionInfo( ) | 283 | public RegionInfo ToRegionInfo() |
| 284 | { | 284 | { |
| 285 | return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort, serverURI ); | 285 | return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort, serverURI); |
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | public static RegionProfileData FromRegionInfo( RegionInfo regionInfo ) | 288 | public static RegionProfileData FromRegionInfo(RegionInfo regionInfo) |
| 289 | { | 289 | { |
| 290 | if( regionInfo == null ) | 290 | if (regionInfo == null) |
| 291 | { | 291 | { |
| 292 | return null; | 292 | return null; |
| 293 | } | 293 | } |
| 294 | 294 | ||
| 295 | return Create(regionInfo.RegionID, regionInfo.RegionName, regionInfo.RegionLocX, | 295 | return Create(regionInfo.RegionID, regionInfo.RegionName, regionInfo.RegionLocX, |
| 296 | regionInfo.RegionLocY, regionInfo.ExternalHostName, | 296 | regionInfo.RegionLocY, regionInfo.ExternalHostName, |
| 297 | (uint) regionInfo.ExternalEndPoint.Port, regionInfo.HttpPort, regionInfo.RemotingPort, | 297 | (uint) regionInfo.ExternalEndPoint.Port, regionInfo.HttpPort, regionInfo.RemotingPort, |
| 298 | regionInfo.ServerURI); | 298 | regionInfo.ServerURI); |
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | public static RegionProfileData Create(UUID regionID, string regionName, uint locX, uint locY, string externalHostName, uint regionPort, uint httpPort, uint remotingPort, string serverUri) | 301 | public static RegionProfileData Create(UUID regionID, string regionName, uint locX, uint locY, string externalHostName, uint regionPort, uint httpPort, uint remotingPort, string serverUri) |