aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index a5150e6..fcb2493 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -64,8 +64,8 @@ namespace OpenSim
64 64
65 public class OpenSimMain : RegionApplicationBase, conscmd_callback 65 public class OpenSimMain : RegionApplicationBase, conscmd_callback
66 { 66 {
67 // private CheckSumServer checkServer;
68 protected CommunicationsManager commsManager; 67 protected CommunicationsManager commsManager;
68 // private CheckSumServer checkServer;
69 69
70 private bool m_silent; 70 private bool m_silent;
71 private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log"; 71 private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log";
@@ -106,14 +106,12 @@ namespace OpenSim
106 106
107 ClientView.TerrainManager = new TerrainManager(new SecondLife()); 107 ClientView.TerrainManager = new TerrainManager(new SecondLife());
108 108
109 CommunicationsLocal sandboxCommunications = null;
110 if (m_sandbox) 109 if (m_sandbox)
111 { 110 {
112 this.SetupLocalGridServers(); 111 this.SetupLocalGridServers();
113 // this.checkServer = new CheckSumServer(12036); 112 // this.checkServer = new CheckSumServer(12036);
114 // this.checkServer.ServerListener(); 113 // this.checkServer.ServerListener();
115 sandboxCommunications = new CommunicationsLocal(this.serversData); 114 this.commsManager = new CommunicationsLocal(this.serversData);
116 this.commsManager = sandboxCommunications;
117 } 115 }
118 else 116 else
119 { 117 {
@@ -136,7 +134,7 @@ namespace OpenSim
136 134
137 if (m_sandbox) 135 if (m_sandbox)
138 { 136 {
139 httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod); 137 httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod);
140 } 138 }
141 139
142 //Start http server 140 //Start http server