aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2008-11-04 16:17:27 +0000
committerDr Scofield2008-11-04 16:17:27 +0000
commitf57d1307ab32fcd999a1df5437cdb6c2354ac7ed (patch)
treec4587e1fa1315122ab38fbe62595d2c9da4847c3
parentimplement email field for MySQL and SQLite (diff)
downloadopensim-SC-f57d1307ab32fcd999a1df5437cdb6c2354ac7ed.zip
opensim-SC-f57d1307ab32fcd999a1df5437cdb6c2354ac7ed.tar.gz
opensim-SC-f57d1307ab32fcd999a1df5437cdb6c2354ac7ed.tar.bz2
opensim-SC-f57d1307ab32fcd999a1df5437cdb6c2354ac7ed.tar.xz
fix: ArchiveReadRequest.URIFetch stumbles over absent content length field
fix: region parameter in IRCBridgeModule XmlRpc was check for presence but not actually used...
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs3
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
index e413290..094fa6d 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
@@ -234,6 +234,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
234 234
235 if (!requestData.ContainsKey("region")) 235 if (!requestData.ContainsKey("region"))
236 throw new Exception("No region name specified"); 236 throw new Exception("No region name specified");
237 region = (string)requestData["region"];
237 238
238 foreach (RegionState rs in m_regions) 239 foreach (RegionState rs in m_regions)
239 { 240 {
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index c3d017a..2fe36a8 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -342,7 +342,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
342 if (response.ContentLength == 0) 342 if (response.ContentLength == 0)
343 throw new Exception(String.Format("{0} returned an empty file", uri.ToString())); 343 throw new Exception(String.Format("{0} returned an empty file", uri.ToString()));
344 344
345 return new BufferedStream(file, (int) response.ContentLength); 345 // return new BufferedStream(file, (int) response.ContentLength);
346 return new BufferedStream(file, 1000000);
346 347
347 } 348 }
348 349