diff options
| author | Melanie | 2012-06-29 22:11:49 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-29 22:11:49 +0100 |
| commit | 05cf51cbbdb3f33bb4c532eefc24eb0a194ed378 (patch) | |
| tree | 5514845e589587a84a621bb6e576136d4869ad29 /OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |
| parent | Revert "Mantis 5977 Corrections to llRegionSayTo" (diff) | |
| parent | Fix llRegionSayTo the right way (diff) | |
| download | opensim-SC-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.zip opensim-SC-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.tar.gz opensim-SC-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.tar.bz2 opensim-SC-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 56c3c7d..192b4f6 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
| @@ -532,7 +532,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
| 532 | } | 532 | } |
| 533 | else | 533 | else |
| 534 | { | 534 | { |
| 535 | m_log.Warn("[HttpRequestHandler]: http-in request failed; no such url: "+urlkey.ToString()); | 535 | //m_log.Warn("[HttpRequestHandler]: http-in request failed; no such url: "+urlkey.ToString()); |
| 536 | return; | ||
| 536 | } | 537 | } |
| 537 | 538 | ||
| 538 | //for llGetHttpHeader support we need to store original URI here | 539 | //for llGetHttpHeader support we need to store original URI here |