aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-12-03 06:29:36 +0000
committerAdam Frisby2007-12-03 06:29:36 +0000
commit4b95eb589bec930ab13a69443c56973fca90a1d3 (patch)
treecd25edfdd8057631202e9611c8c1cc76d36db7ba
parentJust for Cfk! (diff)
downloadopensim-SC_OLD-4b95eb589bec930ab13a69443c56973fca90a1d3.zip
opensim-SC_OLD-4b95eb589bec930ab13a69443c56973fca90a1d3.tar.gz
opensim-SC_OLD-4b95eb589bec930ab13a69443c56973fca90a1d3.tar.bz2
opensim-SC_OLD-4b95eb589bec930ab13a69443c56973fca90a1d3.tar.xz
* Applied a few commits left on my laptop to OpenSimController.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimController.cs20
1 files changed, 11 insertions, 9 deletions
diff --git a/OpenSim/Region/Application/OpenSimController.cs b/OpenSim/Region/Application/OpenSimController.cs
index 1fa4b04..9fae426 100644
--- a/OpenSim/Region/Application/OpenSimController.cs
+++ b/OpenSim/Region/Application/OpenSimController.cs
@@ -13,7 +13,7 @@ namespace OpenSim
13 { 13 {
14 private OpenSimMain m_app; 14 private OpenSimMain m_app;
15 private BaseHttpServer m_httpServer; 15 private BaseHttpServer m_httpServer;
16 private const bool m_enablexmlrpc = false; 16 private const bool m_enablexmlrpc = true;
17 17
18 public OpenSimController(OpenSimMain core, BaseHttpServer httpd) 18 public OpenSimController(OpenSimMain core, BaseHttpServer httpd)
19 { 19 {
@@ -35,7 +35,7 @@ namespace OpenSim
35 35
36 if ((string) requestData["shutdown"] == "delayed") 36 if ((string) requestData["shutdown"] == "delayed")
37 { 37 {
38 int timeout = Convert.ToInt32((string) requestData["milliseconds"]); 38 int timeout = (Int32)requestData["milliseconds"];
39 39
40 Hashtable responseData = new Hashtable(); 40 Hashtable responseData = new Hashtable();
41 responseData["accepted"] = "true"; 41 responseData["accepted"] = "true";
@@ -48,6 +48,7 @@ namespace OpenSim
48 Timer shutdownTimer = new Timer(timeout); // Wait before firing 48 Timer shutdownTimer = new Timer(timeout); // Wait before firing
49 shutdownTimer.AutoReset = false; 49 shutdownTimer.AutoReset = false;
50 shutdownTimer.Elapsed += new ElapsedEventHandler(shutdownTimer_Elapsed); 50 shutdownTimer.Elapsed += new ElapsedEventHandler(shutdownTimer_Elapsed);
51 shutdownTimer.Start();
51 52
52 return response; 53 return response;
53 } 54 }
@@ -63,6 +64,7 @@ namespace OpenSim
63 Timer shutdownTimer = new Timer(2000); // Wait 2 seconds before firing 64 Timer shutdownTimer = new Timer(2000); // Wait 2 seconds before firing
64 shutdownTimer.AutoReset = false; 65 shutdownTimer.AutoReset = false;
65 shutdownTimer.Elapsed += new ElapsedEventHandler(shutdownTimer_Elapsed); 66 shutdownTimer.Elapsed += new ElapsedEventHandler(shutdownTimer_Elapsed);
67 shutdownTimer.Start();
66 68
67 return response; 69 return response;
68 } 70 }
@@ -83,10 +85,10 @@ namespace OpenSim
83 85
84 try 86 try
85 { 87 {
86 newRegionData.RegionID = (string) requestData["region_id"]; 88 newRegionData.RegionID = (string)requestData["region_id"];
87 newRegionData.RegionName = (string) requestData["region_name"]; 89 newRegionData.RegionName = (string)requestData["region_name"];
88 newRegionData.RegionLocX = Convert.ToUInt32((string) requestData["region_x"]); 90 newRegionData.RegionLocX = Convert.ToUInt32((Int32)requestData["region_x"]);
89 newRegionData.RegionLocY = Convert.ToUInt32((string) requestData["region_y"]); 91 newRegionData.RegionLocY = Convert.ToUInt32((Int32)requestData["region_y"]);
90 92
91 // Security risk 93 // Security risk
92 newRegionData.DataStore = (string) requestData["datastore"]; 94 newRegionData.DataStore = (string) requestData["datastore"];
@@ -94,8 +96,8 @@ namespace OpenSim
94 newRegionData.InternalEndPoint = new IPEndPoint( 96 newRegionData.InternalEndPoint = new IPEndPoint(
95 IPAddress.Parse((string) requestData["listen_ip"]), 0); 97 IPAddress.Parse((string) requestData["listen_ip"]), 0);
96 98
97 newRegionData.InternalEndPoint.Port = Convert.ToInt32((string) requestData["listen_port"]); 99 newRegionData.InternalEndPoint.Port = (Int32)requestData["listen_port"];
98 newRegionData.ExternalHostName = (string) requestData["external_address"]; 100 newRegionData.ExternalHostName = (string)requestData["external_address"];
99 101
100 newRegionData.MasterAvatarFirstName = (string) requestData["region_master_first"]; 102 newRegionData.MasterAvatarFirstName = (string) requestData["region_master_first"];
101 newRegionData.MasterAvatarLastName = (string) requestData["region_master_last"]; 103 newRegionData.MasterAvatarLastName = (string) requestData["region_master_last"];
@@ -117,4 +119,4 @@ namespace OpenSim
117 return response; 119 return response;
118 } 120 }
119 } 121 }
120} \ No newline at end of file 122}