aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorCharles Krinke2008-07-10 13:55:01 +0000
committerCharles Krinke2008-07-10 13:55:01 +0000
commit14a66569486eeed58845d172dd456b0607a0e860 (patch)
tree9393a8895f30415bba4b4dbfc32858b192ba58ae /OpenSim
parentMantis#1391. Thank you kindly, Phrearch for a patch that: (diff)
downloadopensim-SC_OLD-14a66569486eeed58845d172dd456b0607a0e860.zip
opensim-SC_OLD-14a66569486eeed58845d172dd456b0607a0e860.tar.gz
opensim-SC_OLD-14a66569486eeed58845d172dd456b0607a0e860.tar.bz2
opensim-SC_OLD-14a66569486eeed58845d172dd456b0607a0e860.tar.xz
Mantis#1541. Thank you kindly, Phrearch for a patch that:
Solves Remote Admin create_region type Casting failure.
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 3f6869e..767b736 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -393,8 +393,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
393 393
394 region.RegionID = regionID; 394 region.RegionID = regionID;
395 region.RegionName = (string) requestData["region_name"]; 395 region.RegionName = (string) requestData["region_name"];
396 region.RegionLocX = Convert.ToUInt32((Int32) requestData["region_x"]); 396 region.RegionLocX = Convert.ToUInt32(requestData["region_x"]);
397 region.RegionLocY = Convert.ToUInt32((Int32) requestData["region_y"]); 397 region.RegionLocY = Convert.ToUInt32(requestData["region_y"]);
398 398
399 // check for collisions: region name, region UUID, 399 // check for collisions: region name, region UUID,
400 // region location 400 // region location
@@ -416,7 +416,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
416 region.InternalEndPoint = 416 region.InternalEndPoint =
417 new IPEndPoint(IPAddress.Parse((string) requestData["listen_ip"]), 0); 417 new IPEndPoint(IPAddress.Parse((string) requestData["listen_ip"]), 0);
418 418
419 region.InternalEndPoint.Port = (Int32) requestData["listen_port"]; 419 region.InternalEndPoint.Port = Convert.ToInt32(requestData["listen_port"]);
420 if (0 == region.InternalEndPoint.Port) throw new Exception("listen_port is 0"); 420 if (0 == region.InternalEndPoint.Port) throw new Exception("listen_port is 0");
421 if (m_app.SceneManager.TryGetScene(region.InternalEndPoint, out scene)) 421 if (m_app.SceneManager.TryGetScene(region.InternalEndPoint, out scene))
422 throw new Exception(String.Format("region internal IP {0} and port {1} already in use by region {2}, UUID {3}, <{4},{5}>", 422 throw new Exception(String.Format("region internal IP {0} and port {1} already in use by region {2}, UUID {3}, <{4},{5}>",