diff options
Diffstat (limited to 'OpenSim/Data/RegionProfileServiceProxy.cs')
| -rw-r--r-- | OpenSim/Data/RegionProfileServiceProxy.cs | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/OpenSim/Data/RegionProfileServiceProxy.cs b/OpenSim/Data/RegionProfileServiceProxy.cs index 126e363..da71936 100644 --- a/OpenSim/Data/RegionProfileServiceProxy.cs +++ b/OpenSim/Data/RegionProfileServiceProxy.cs | |||
| @@ -56,20 +56,17 @@ namespace OpenSim.Data | |||
| 56 | 56 | ||
| 57 | if (!responseData.ContainsKey("error")) | 57 | if (!responseData.ContainsKey("error")) |
| 58 | { | 58 | { |
| 59 | simData = new RegionProfileData(); | 59 | uint locX = Convert.ToUInt32((string)responseData["region_locx"]); |
| 60 | simData.regionLocX = Convert.ToUInt32((string) responseData["region_locx"]); | 60 | uint locY = Convert.ToUInt32((string)responseData["region_locy"]); |
| 61 | simData.regionLocY = Convert.ToUInt32((string) responseData["region_locy"]); | 61 | string externalHostName = (string)responseData["sim_ip"]; |
| 62 | simData.regionHandle = | 62 | uint simPort = Convert.ToUInt32((string)responseData["sim_port"]); |
| 63 | Utils.UIntsToLong((simData.regionLocX * Constants.RegionSize), | 63 | uint httpPort = Convert.ToUInt32((string)responseData["http_port"]); |
| 64 | (simData.regionLocY*Constants.RegionSize)); | 64 | uint remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]); |
| 65 | simData.serverIP = (string) responseData["sim_ip"]; | 65 | string serverUri = (string)responseData["server_uri"]; |
| 66 | simData.serverPort = Convert.ToUInt32((string) responseData["sim_port"]); | 66 | UUID regionID = new UUID((string)responseData["region_UUID"]); |
| 67 | simData.httpPort = Convert.ToUInt32((string) responseData["http_port"]); | 67 | string regionName = (string)responseData["region_name"]; |
| 68 | simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); | 68 | |
| 69 | simData.serverURI = (string) responseData["server_uri"]; | 69 | simData = RegionProfileData.Create(regionID, regionName, locX, locY, externalHostName, simPort, httpPort, remotingPort, serverUri); |
| 70 | simData.httpServerURI = "http://" + (string)responseData["sim_ip"] + ":" + simData.httpPort.ToString() + "/"; | ||
| 71 | simData.UUID = new UUID((string) responseData["region_UUID"]); | ||
| 72 | simData.regionName = (string) responseData["region_name"]; | ||
| 73 | } | 70 | } |
| 74 | 71 | ||
| 75 | return simData; | 72 | return simData; |