aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
authorlbsa712007-04-11 20:07:58 +0000
committerlbsa712007-04-11 20:07:58 +0000
commit1a28ef6292a152a69d0f53803daacc7dad522cea (patch)
tree3d4e2eed288b208f1d0db7d37e8f1d9a1dfca1c5 /OpenSim.RegionServer
parent* cleaning (diff)
downloadopensim-SC_OLD-1a28ef6292a152a69d0f53803daacc7dad522cea.zip
opensim-SC_OLD-1a28ef6292a152a69d0f53803daacc7dad522cea.tar.gz
opensim-SC_OLD-1a28ef6292a152a69d0f53803daacc7dad522cea.tar.bz2
opensim-SC_OLD-1a28ef6292a152a69d0f53803daacc7dad522cea.tar.xz
* Replaced GridHTTPServer and UserHTTPServer with BaseHttpServer
* Now dumping default value in config. *
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs16
-rw-r--r--OpenSim.RegionServer/RegionInfo.cs16
-rw-r--r--OpenSim.RegionServer/world/Avatar.cs2
-rw-r--r--OpenSim.RegionServer/world/Primitive2.cs1
4 files changed, 17 insertions, 18 deletions
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 9ea32b1..8c93128 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -60,7 +60,6 @@ namespace OpenSim
60 //private IGenericConfig remoteConfig; 60 //private IGenericConfig remoteConfig;
61 private PhysicsManager physManager; 61 private PhysicsManager physManager;
62 private Grid GridServers; 62 private Grid GridServers;
63 private BaseHttpServer _httpServer;
64 private PacketServer _packetServer; 63 private PacketServer _packetServer;
65 private World LocalWorld; 64 private World LocalWorld;
66 private AssetCache AssetCache; 65 private AssetCache AssetCache;
@@ -175,12 +174,13 @@ namespace OpenSim
175 174
176 m_console.WriteLine("Main.cs:Startup() - Initialising HTTP server"); 175 m_console.WriteLine("Main.cs:Startup() - Initialising HTTP server");
177 // HttpServer = new SimCAPSHTTPServer(GridServers.GridServer, Cfg.IPListenPort); 176 // HttpServer = new SimCAPSHTTPServer(GridServers.GridServer, Cfg.IPListenPort);
178 _httpServer = new BaseHttpServer(regionData.IPListenPort); 177
178 BaseHttpServer httpServer = new BaseHttpServer( regionData.IPListenPort );
179 179
180 if (gridServer.GetName() == "Remote") 180 if (gridServer.GetName() == "Remote")
181 { 181 {
182 //we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server 182 //we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
183 _httpServer.AddXmlRPCHandler("expect_user", 183 httpServer.AddXmlRPCHandler("expect_user",
184 delegate(XmlRpcRequest request) 184 delegate(XmlRpcRequest request)
185 { 185 {
186 Hashtable requestData = (Hashtable)request.Params[0]; 186 Hashtable requestData = (Hashtable)request.Params[0];
@@ -196,7 +196,7 @@ namespace OpenSim
196 196
197 return new XmlRpcResponse(); 197 return new XmlRpcResponse();
198 }); 198 });
199 _httpServer.AddRestHandler("GET", "/simstatus/", 199 httpServer.AddRestHandler("GET", "/simstatus/",
200 delegate(string request, string path, string param ) 200 delegate(string request, string path, string param )
201 { 201 {
202 return "OK"; 202 return "OK";
@@ -218,20 +218,20 @@ namespace OpenSim
218 this.GridServers.UserServer = loginServer; 218 this.GridServers.UserServer = loginServer;
219 adminLoginServer = loginServer; 219 adminLoginServer = loginServer;
220 220
221 _httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.LocalUserManager.XmlRpcLoginMethod); 221 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.LocalUserManager.XmlRpcLoginMethod);
222 } 222 }
223 else 223 else
224 { 224 {
225 //sandbox mode with loginserver not using accounts 225 //sandbox mode with loginserver not using accounts
226 _httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod); 226 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
227 } 227 }
228 } 228 }
229 229
230 AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer); 230 AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer);
231 adminWebFront.LoadMethods(_httpServer); 231 adminWebFront.LoadMethods(httpServer);
232 232
233 m_console.WriteLine("Main.cs:Startup() - Starting HTTP server"); 233 m_console.WriteLine("Main.cs:Startup() - Starting HTTP server");
234 _httpServer.Start(); 234 httpServer.Start();
235 235
236 MainServerListener(); 236 MainServerListener();
237 237
diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs
index 83c69ff..1256b50 100644
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim.RegionServer/RegionInfo.cs
@@ -94,7 +94,7 @@ namespace OpenSim
94 attri = configData.GetAttribute("SimName"); 94 attri = configData.GetAttribute("SimName");
95 if (attri == "") 95 if (attri == "")
96 { 96 {
97 this.RegionName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Name [OpenSim test]: ", "OpenSim test"); 97 this.RegionName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Name", "OpenSim test");
98 configData.SetAttribute("SimName", this.RegionName); 98 configData.SetAttribute("SimName", this.RegionName);
99 } 99 }
100 else 100 else
@@ -106,7 +106,7 @@ namespace OpenSim
106 attri = configData.GetAttribute("SimLocationX"); 106 attri = configData.GetAttribute("SimLocationX");
107 if (attri == "") 107 if (attri == "")
108 { 108 {
109 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location X [997]: ", "997"); 109 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location X", "997");
110 configData.SetAttribute("SimLocationX", location); 110 configData.SetAttribute("SimLocationX", location);
111 this.RegionLocX = (uint)Convert.ToUInt32(location); 111 this.RegionLocX = (uint)Convert.ToUInt32(location);
112 } 112 }
@@ -119,7 +119,7 @@ namespace OpenSim
119 attri = configData.GetAttribute("SimLocationY"); 119 attri = configData.GetAttribute("SimLocationY");
120 if (attri == "") 120 if (attri == "")
121 { 121 {
122 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location Y [996]: ", "996"); 122 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location Y", "996");
123 configData.SetAttribute("SimLocationY", location); 123 configData.SetAttribute("SimLocationY", location);
124 this.RegionLocY = (uint)Convert.ToUInt32(location); 124 this.RegionLocY = (uint)Convert.ToUInt32(location);
125 } 125 }
@@ -132,7 +132,7 @@ namespace OpenSim
132 attri = configData.GetAttribute("SimListenPort"); 132 attri = configData.GetAttribute("SimListenPort");
133 if (attri == "") 133 if (attri == "")
134 { 134 {
135 string port = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("UDP port for client connections [9000]: ", "9000"); 135 string port = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("UDP port for client connections", "9000");
136 configData.SetAttribute("SimListenPort", port); 136 configData.SetAttribute("SimListenPort", port);
137 this.IPListenPort = Convert.ToInt32(port); 137 this.IPListenPort = Convert.ToInt32(port);
138 } 138 }
@@ -145,7 +145,7 @@ namespace OpenSim
145 attri = configData.GetAttribute("SimListenAddress"); 145 attri = configData.GetAttribute("SimListenAddress");
146 if (attri == "") 146 if (attri == "")
147 { 147 {
148 this.IPListenAddr = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections [127.0.0.1]: ", "127.0.0.1"); 148 this.IPListenAddr = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections", "127.0.0.1");
149 configData.SetAttribute("SimListenAddress", this.IPListenAddr); 149 configData.SetAttribute("SimListenAddress", this.IPListenAddr);
150 } 150 }
151 else 151 else
@@ -162,7 +162,7 @@ namespace OpenSim
162 attri = configData.GetAttribute("GridServerURL"); 162 attri = configData.GetAttribute("GridServerURL");
163 if (attri == "") 163 if (attri == "")
164 { 164 {
165 this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL: "); 165 this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL");
166 configData.SetAttribute("GridServerURL", this.GridURL); 166 configData.SetAttribute("GridServerURL", this.GridURL);
167 } 167 }
168 else 168 else
@@ -175,7 +175,7 @@ namespace OpenSim
175 attri = configData.GetAttribute("GridSendKey"); 175 attri = configData.GetAttribute("GridSendKey");
176 if (attri == "") 176 if (attri == "")
177 { 177 {
178 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server: "); 178 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server");
179 configData.SetAttribute("GridSendKey", this.GridSendKey); 179 configData.SetAttribute("GridSendKey", this.GridSendKey);
180 } 180 }
181 else 181 else
@@ -188,7 +188,7 @@ namespace OpenSim
188 attri = configData.GetAttribute("GridRecvKey"); 188 attri = configData.GetAttribute("GridRecvKey");
189 if (attri == "") 189 if (attri == "")
190 { 190 {
191 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server: "); 191 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server");
192 configData.SetAttribute("GridRecvKey", this.GridRecvKey); 192 configData.SetAttribute("GridRecvKey", this.GridRecvKey);
193 } 193 }
194 else 194 else
diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs
index 843c3af..42a2067 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim.RegionServer/world/Avatar.cs
@@ -32,7 +32,7 @@ namespace OpenSim.world
32 private ulong m_regionHandle; 32 private ulong m_regionHandle;
33 private Dictionary<uint, SimClient> m_clientThreads; 33 private Dictionary<uint, SimClient> m_clientThreads;
34 private string m_regionName; 34 private string m_regionName;
35 private bool childShadowAvatar = false; 35 //private bool childShadowAvatar = false;
36 36
37 public Avatar(SimClient TheClient, World world, string regionName, Dictionary<uint, SimClient> clientThreads, ulong regionHandle) 37 public Avatar(SimClient TheClient, World world, string regionName, Dictionary<uint, SimClient> clientThreads, ulong regionHandle)
38 { 38 {
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim.RegionServer/world/Primitive2.cs
index 4b26fbe..616dc25 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim.RegionServer/world/Primitive2.cs
@@ -22,7 +22,6 @@ namespace OpenSim.world
22 private bool physicsEnabled = false; 22 private bool physicsEnabled = false;
23 23
24 private Dictionary<LLUUID, InventoryItem> inventoryItems; 24 private Dictionary<LLUUID, InventoryItem> inventoryItems;
25 private string inventoryFileName = "";
26 25
27 #region Properties 26 #region Properties
28 27