diff options
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 20 | ||||
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/AssetDownloadModule.cs | 8 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 5 |
5 files changed, 11 insertions, 28 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index e61cc80..a61c177 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | |||
28 | using System; | 29 | using System; |
29 | using System.Collections; | 30 | using System.Collections; |
30 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
@@ -121,7 +122,6 @@ namespace OpenSim.Framework.Servers | |||
121 | HttpListenerRequest request = context.Request; | 122 | HttpListenerRequest request = context.Request; |
122 | HttpListenerResponse response = context.Response; | 123 | HttpListenerResponse response = context.Response; |
123 | 124 | ||
124 | |||
125 | response.KeepAlive = false; | 125 | response.KeepAlive = false; |
126 | response.SendChunked = false; | 126 | response.SendChunked = false; |
127 | 127 | ||
@@ -160,7 +160,7 @@ namespace OpenSim.Framework.Servers | |||
160 | response.OutputStream.Write(buffer, 0, buffer.Length); | 160 | response.OutputStream.Write(buffer, 0, buffer.Length); |
161 | response.OutputStream.Close(); | 161 | response.OutputStream.Close(); |
162 | } | 162 | } |
163 | catch (HttpListenerException e) | 163 | catch (HttpListenerException) |
164 | { | 164 | { |
165 | m_log.InfoFormat("[BASEHTTPSERVER] Http request abnormally terminated."); | 165 | m_log.InfoFormat("[BASEHTTPSERVER] Http request abnormally terminated."); |
166 | } | 166 | } |
@@ -263,9 +263,8 @@ namespace OpenSim.Framework.Servers | |||
263 | { | 263 | { |
264 | xmlRprcRequest = (XmlRpcRequest) (new XmlRpcRequestDeserializer()).Deserialize(requestBody); | 264 | xmlRprcRequest = (XmlRpcRequest) (new XmlRpcRequestDeserializer()).Deserialize(requestBody); |
265 | } | 265 | } |
266 | catch (XmlException e) | 266 | catch (XmlException) |
267 | { | 267 | { |
268 | |||
269 | } | 268 | } |
270 | 269 | ||
271 | if (xmlRprcRequest != null) | 270 | if (xmlRprcRequest != null) |
@@ -407,8 +406,6 @@ namespace OpenSim.Framework.Servers | |||
407 | reader.Close(); | 406 | reader.Close(); |
408 | requestStream.Close(); | 407 | requestStream.Close(); |
409 | 408 | ||
410 | string responseString = String.Empty; | ||
411 | |||
412 | Hashtable keysvals = new Hashtable(); | 409 | Hashtable keysvals = new Hashtable(); |
413 | Hashtable headervals = new Hashtable(); | 410 | Hashtable headervals = new Hashtable(); |
414 | string host = String.Empty; | 411 | string host = String.Empty; |
@@ -416,11 +413,9 @@ namespace OpenSim.Framework.Servers | |||
416 | string[] querystringkeys = request.QueryString.AllKeys; | 413 | string[] querystringkeys = request.QueryString.AllKeys; |
417 | string[] rHeaders = request.Headers.AllKeys; | 414 | string[] rHeaders = request.Headers.AllKeys; |
418 | 415 | ||
419 | |||
420 | foreach (string queryname in querystringkeys) | 416 | foreach (string queryname in querystringkeys) |
421 | { | 417 | { |
422 | keysvals.Add(queryname, request.QueryString[queryname]); | 418 | keysvals.Add(queryname, request.QueryString[queryname]); |
423 | |||
424 | } | 419 | } |
425 | 420 | ||
426 | foreach (string headername in rHeaders) | 421 | foreach (string headername in rHeaders) |
@@ -447,7 +442,6 @@ namespace OpenSim.Framework.Servers | |||
447 | DoHTTPGruntWork(responsedata,response); | 442 | DoHTTPGruntWork(responsedata,response); |
448 | 443 | ||
449 | //SendHTML500(response); | 444 | //SendHTML500(response); |
450 | |||
451 | } | 445 | } |
452 | else | 446 | else |
453 | { | 447 | { |
@@ -484,6 +478,7 @@ namespace OpenSim.Framework.Servers | |||
484 | response.SendChunked = false; | 478 | response.SendChunked = false; |
485 | response.ContentLength64 = buffer.Length; | 479 | response.ContentLength64 = buffer.Length; |
486 | response.ContentEncoding = Encoding.UTF8; | 480 | response.ContentEncoding = Encoding.UTF8; |
481 | |||
487 | try | 482 | try |
488 | { | 483 | { |
489 | response.OutputStream.Write(buffer, 0, buffer.Length); | 484 | response.OutputStream.Write(buffer, 0, buffer.Length); |
@@ -496,9 +491,8 @@ namespace OpenSim.Framework.Servers | |||
496 | { | 491 | { |
497 | response.OutputStream.Close(); | 492 | response.OutputStream.Close(); |
498 | } | 493 | } |
499 | |||
500 | |||
501 | } | 494 | } |
495 | |||
502 | public void SendHTML404(HttpListenerResponse response, string host) | 496 | public void SendHTML404(HttpListenerResponse response, string host) |
503 | { | 497 | { |
504 | // I know this statuscode is dumb, but the client doesn't respond to 404s and 500s | 498 | // I know this statuscode is dumb, but the client doesn't respond to 404s and 500s |
@@ -511,6 +505,7 @@ namespace OpenSim.Framework.Servers | |||
511 | response.SendChunked = false; | 505 | response.SendChunked = false; |
512 | response.ContentLength64 = buffer.Length; | 506 | response.ContentLength64 = buffer.Length; |
513 | response.ContentEncoding = Encoding.UTF8; | 507 | response.ContentEncoding = Encoding.UTF8; |
508 | |||
514 | try | 509 | try |
515 | { | 510 | { |
516 | response.OutputStream.Write(buffer, 0, buffer.Length); | 511 | response.OutputStream.Write(buffer, 0, buffer.Length); |
@@ -524,6 +519,7 @@ namespace OpenSim.Framework.Servers | |||
524 | response.OutputStream.Close(); | 519 | response.OutputStream.Close(); |
525 | } | 520 | } |
526 | } | 521 | } |
522 | |||
527 | public void SendHTML500(HttpListenerResponse response) | 523 | public void SendHTML500(HttpListenerResponse response) |
528 | { | 524 | { |
529 | // I know this statuscode is dumb, but the client doesn't respond to 404s and 500s | 525 | // I know this statuscode is dumb, but the client doesn't respond to 404s and 500s |
@@ -592,7 +588,6 @@ namespace OpenSim.Framework.Servers | |||
592 | } | 588 | } |
593 | } | 589 | } |
594 | 590 | ||
595 | |||
596 | public void RemoveStreamHandler(string httpMethod, string path) | 591 | public void RemoveStreamHandler(string httpMethod, string path) |
597 | { | 592 | { |
598 | m_streamHandlers.Remove(GetHandlerKey(httpMethod, path)); | 593 | m_streamHandlers.Remove(GetHandlerKey(httpMethod, path)); |
@@ -637,6 +632,5 @@ namespace OpenSim.Framework.Servers | |||
637 | { | 632 | { |
638 | return "<HTML><HEAD><TITLE>500 Internal Server Error</TITLE><BODY><BR /><H1>Ooops!</H1><P>The server you requested is overun by knomes! Find hippos quick!</P></BODY></HTML>"; | 633 | return "<HTML><HEAD><TITLE>500 Internal Server Error</TITLE><BODY><BR /><H1>Ooops!</H1><P>The server you requested is overun by knomes! Find hippos quick!</P></BODY></HTML>"; |
639 | } | 634 | } |
640 | |||
641 | } | 635 | } |
642 | } | 636 | } |
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 0e2608a..6faca1b 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -68,7 +68,6 @@ namespace OpenSim | |||
68 | configSource.AddSwitch("Startup", "inifile"); | 68 | configSource.AddSwitch("Startup", "inifile"); |
69 | configSource.AddSwitch("Startup", "gridmode"); | 69 | configSource.AddSwitch("Startup", "gridmode"); |
70 | configSource.AddSwitch("Startup", "physics"); | 70 | configSource.AddSwitch("Startup", "physics"); |
71 | configSource.AddSwitch("Startup", "verbose"); | ||
72 | configSource.AddSwitch("Startup", "useexecutepath"); | 71 | configSource.AddSwitch("Startup", "useexecutepath"); |
73 | 72 | ||
74 | configSource.AddConfig("StandAlone"); | 73 | configSource.AddConfig("StandAlone"); |
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 6e89143..bdefd0f 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -78,7 +78,6 @@ namespace OpenSim | |||
78 | protected List<UDPServer> m_udpServers = new List<UDPServer>(); | 78 | protected List<UDPServer> m_udpServers = new List<UDPServer>(); |
79 | protected List<RegionInfo> m_regionData = new List<RegionInfo>(); | 79 | protected List<RegionInfo> m_regionData = new List<RegionInfo>(); |
80 | 80 | ||
81 | private bool m_verbose; | ||
82 | private bool m_physicalPrim; | 81 | private bool m_physicalPrim; |
83 | private bool m_permissions = false; | 82 | private bool m_permissions = false; |
84 | 83 | ||
@@ -173,7 +172,6 @@ namespace OpenSim | |||
173 | { | 172 | { |
174 | config.Set("gridmode", false); | 173 | config.Set("gridmode", false); |
175 | config.Set("physics", "basicphysics"); | 174 | config.Set("physics", "basicphysics"); |
176 | config.Set("verbose", true); | ||
177 | config.Set("physical_prim", true); | 175 | config.Set("physical_prim", true); |
178 | config.Set("see_into_this_sim_from_neighbor", true); | 176 | config.Set("see_into_this_sim_from_neighbor", true); |
179 | config.Set("serverside_object_permissions", false); | 177 | config.Set("serverside_object_permissions", false); |
@@ -241,9 +239,6 @@ namespace OpenSim | |||
241 | m_physicsEngine = startupConfig.GetString("physics", "basicphysics"); | 239 | m_physicsEngine = startupConfig.GetString("physics", "basicphysics"); |
242 | m_meshEngineName = startupConfig.GetString("meshing", "ZeroMesher"); | 240 | m_meshEngineName = startupConfig.GetString("meshing", "ZeroMesher"); |
243 | 241 | ||
244 | // TODO: since log4net changes, verbose flag doesn't do anything | ||
245 | m_verbose = startupConfig.GetBoolean("verbose", true); | ||
246 | |||
247 | m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); | 242 | m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); |
248 | 243 | ||
249 | m_see_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); | 244 | m_see_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); |
diff --git a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs index f53be41..33c0ce2 100644 --- a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs | |||
@@ -131,7 +131,6 @@ namespace OpenSim.Region.Environment.Modules | |||
131 | { | 131 | { |
132 | if (!userRequests.ContainsKey(requestID)) | 132 | if (!userRequests.ContainsKey(requestID)) |
133 | { | 133 | { |
134 | |||
135 | AssetRequest request = new AssetRequest(); | 134 | AssetRequest request = new AssetRequest(); |
136 | request.RequestUser = userInfo; | 135 | request.RequestUser = userInfo; |
137 | request.RequestAssetID = requestID; | 136 | request.RequestAssetID = requestID; |
@@ -154,9 +153,7 @@ namespace OpenSim.Region.Environment.Modules | |||
154 | userRequests.Add(requestID, request); | 153 | userRequests.Add(requestID, request); |
155 | RequestedAssets[userInfo.AgentId] = userRequests; | 154 | RequestedAssets[userInfo.AgentId] = userRequests; |
156 | m_scene.AssetCache.GetAsset(requestID, AssetCallback, false); | 155 | m_scene.AssetCache.GetAsset(requestID, AssetCallback, false); |
157 | |||
158 | } | 156 | } |
159 | return; | ||
160 | } | 157 | } |
161 | 158 | ||
162 | public void AssetCallback(LLUUID assetID, AssetBase asset) | 159 | public void AssetCallback(LLUUID assetID, AssetBase asset) |
@@ -190,7 +187,7 @@ namespace OpenSim.Region.Environment.Modules | |||
190 | ProcessAssetQueue(); | 187 | ProcessAssetQueue(); |
191 | Thread.Sleep(500); | 188 | Thread.Sleep(500); |
192 | } | 189 | } |
193 | catch (Exception e) | 190 | catch (Exception) |
194 | { | 191 | { |
195 | // m_log.Error("[ASSET CACHE]: " + e.ToString()); | 192 | // m_log.Error("[ASSET CACHE]: " + e.ToString()); |
196 | } | 193 | } |
@@ -292,6 +289,7 @@ namespace OpenSim.Region.Environment.Modules | |||
292 | AssetRequests.RemoveAt(0); | 289 | AssetRequests.RemoveAt(0); |
293 | } | 290 | } |
294 | } | 291 | } |
292 | |||
295 | /// <summary> | 293 | /// <summary> |
296 | /// Calculate the number of packets required to send the asset to the client. | 294 | /// Calculate the number of packets required to send the asset to the client. |
297 | /// </summary> | 295 | /// </summary> |
@@ -335,4 +333,4 @@ namespace OpenSim.Region.Environment.Modules | |||
335 | } | 333 | } |
336 | } | 334 | } |
337 | } | 335 | } |
338 | } \ No newline at end of file | 336 | } |
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 084d9f7..ff86bdf 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -61,13 +61,11 @@ physics = basicphysics | |||
61 | ;physics = modified_BulletX | 61 | ;physics = modified_BulletX |
62 | 62 | ||
63 | 63 | ||
64 | verbose = true | ||
65 | startup_console_commands_file = "startup_commands.txt" | 64 | startup_console_commands_file = "startup_commands.txt" |
66 | shutdown_console_commands_file = "shutdown_commands.txt" | 65 | shutdown_console_commands_file = "shutdown_commands.txt" |
67 | serverside_object_permissions = false | 66 | serverside_object_permissions = false |
68 | 67 | ||
69 | 68 | ; if you would like to allow prims to be physical and move by physics with the physical checkbox in the client set this to true. | |
70 | ; if you would like to allow prim to be physical and move by physics with the physical checkbox in the client set this to true. | ||
71 | physical_prim = true | 69 | physical_prim = true |
72 | 70 | ||
73 | ; To run a script every few minutes, set the script filename here | 71 | ; To run a script every few minutes, set the script filename here |
@@ -264,4 +262,3 @@ CleanUpOldScriptsOnStartup=true | |||
264 | [LL-Functions] | 262 | [LL-Functions] |
265 | ; Set the following to true to allow administrator owned scripts to execute console commands | 263 | ; Set the following to true to allow administrator owned scripts to execute console commands |
266 | AllowosConsoleCommand=false | 264 | AllowosConsoleCommand=false |
267 | |||