aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMW2007-07-10 17:56:31 +0000
committerMW2007-07-10 17:56:31 +0000
commit7f03246653a6f277505d2055528cbb8dd2e1f4c1 (patch)
tree357f60cec23bdf29f1037e488fb7f167dc1cd31c /OpenSim/Region/Application
parent* LLSDStreamhandler now works. (diff)
downloadopensim-SC_OLD-7f03246653a6f277505d2055528cbb8dd2e1f4c1.zip
opensim-SC_OLD-7f03246653a6f277505d2055528cbb8dd2e1f4c1.tar.gz
opensim-SC_OLD-7f03246653a6f277505d2055528cbb8dd2e1f4c1.tar.bz2
opensim-SC_OLD-7f03246653a6f277505d2055528cbb8dd2e1f4c1.tar.xz
Gird mode in sugilite should now work in so far as you should be able to login and move between regions in the same instance. Moving to regions in a different instance of opensim still needs implementing (working on it now).
Also trying to look at the map in grid mode will crash the server.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs12
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 949c369..728329e 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -93,17 +93,17 @@ namespace OpenSim
93 93
94 ClientView.TerrainManager = new TerrainManager(new SecondLife()); 94 ClientView.TerrainManager = new TerrainManager(new SecondLife());
95 95
96 this.SetupHttpListener();
97
96 if (m_sandbox) 98 if (m_sandbox)
97 { 99 {
98 this.SetupLocalGridServers(); 100 this.SetupLocalGridServers();
99 // this.checkServer = new CheckSumServer(12036); 101 // this.checkServer = new CheckSumServer(12036);
100 // this.checkServer.ServerListener(); 102 // this.checkServer.ServerListener();
101 this.commsManager = new CommunicationsLocal(this.serversData);
102 } 103 }
103 else 104 else
104 { 105 {
105 this.SetupRemoteGridServers(); 106 this.SetupRemoteGridServers();
106 this.commsManager = new CommunicationsOGS1(this.serversData);
107 } 107 }
108 108
109 startuptime = DateTime.Now; 109 startuptime = DateTime.Now;
@@ -111,14 +111,10 @@ namespace OpenSim
111 this.physManager = new PhysicsManager(); 111 this.physManager = new PhysicsManager();
112 this.physManager.LoadPlugins(); 112 this.physManager.LoadPlugins();
113 113
114 this.SetupHttpListener();
115
116 this.SetupWorld(); 114 this.SetupWorld();
117 115
118 m_log.Verbose("Main.cs:Startup() - Initialising HTTP server"); 116 m_log.Verbose("Main.cs:Startup() - Initialising HTTP server");
119 117
120
121
122 if (m_sandbox) 118 if (m_sandbox)
123 { 119 {
124 httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod); 120 httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod);
@@ -143,6 +139,7 @@ namespace OpenSim
143 { 139 {
144 AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey); 140 AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
145 InventoryCache = new InventoryCache(); 141 InventoryCache = new InventoryCache();
142 this.commsManager = new CommunicationsLocal(this.serversData, httpServer);
146 } 143 }
147 catch (Exception e) 144 catch (Exception e)
148 { 145 {
@@ -156,8 +153,9 @@ namespace OpenSim
156 { 153 {
157 try 154 try
158 { 155 {
159 AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey); 156 AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
160 InventoryCache = new InventoryCache(); 157 InventoryCache = new InventoryCache();
158 this.commsManager = new CommunicationsOGS1(this.serversData, httpServer);
161 } 159 }
162 catch (Exception e) 160 catch (Exception e)
163 { 161 {