diff options
| author | Justin Clark-Casey (justincc) | 2011-03-26 00:57:52 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-03-26 00:57:52 +0000 |
| commit | 3d0e072d500f0d76547fb6f93848a289ee42af9f (patch) | |
| tree | f387ac0d7e5579d6b53fb282c0209b2053063039 /OpenSim/Framework/RegionLoader/Web | |
| parent | Add test for PCM taint. This currently fails due to unexpected behaviour of ... (diff) | |
| parent | Make SceneGraph.ForEachSOG() execute once for each SOG, not once for each pri... (diff) | |
| download | opensim-SC_OLD-3d0e072d500f0d76547fb6f93848a289ee42af9f.zip opensim-SC_OLD-3d0e072d500f0d76547fb6f93848a289ee42af9f.tar.gz opensim-SC_OLD-3d0e072d500f0d76547fb6f93848a289ee42af9f.tar.bz2 opensim-SC_OLD-3d0e072d500f0d76547fb6f93848a289ee42af9f.tar.xz | |
Merge branch 'master' into primcounts
Diffstat (limited to 'OpenSim/Framework/RegionLoader/Web')
| -rw-r--r-- | OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs index 0ec4af5..de4898a 100644 --- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs +++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | |||
| @@ -66,9 +66,9 @@ namespace OpenSim.Framework.RegionLoader.Web | |||
| 66 | { | 66 | { |
| 67 | HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url); | 67 | HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url); |
| 68 | webRequest.Timeout = 30000; //30 Second Timeout | 68 | webRequest.Timeout = 30000; //30 Second Timeout |
| 69 | m_log.Debug("[WEBLOADER]: Sending Download Request..."); | 69 | m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url); |
| 70 | HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse(); | 70 | HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse(); |
| 71 | m_log.Debug("[WEBLOADER]: Downloading Region Information From Remote Server..."); | 71 | m_log.Debug("[WEBLOADER]: Downloading region information..."); |
| 72 | StreamReader reader = new StreamReader(webResponse.GetResponseStream()); | 72 | StreamReader reader = new StreamReader(webResponse.GetResponseStream()); |
| 73 | string xmlSource = String.Empty; | 73 | string xmlSource = String.Empty; |
| 74 | string tempStr = reader.ReadLine(); | 74 | string tempStr = reader.ReadLine(); |