From f57d1307ab32fcd999a1df5437cdb6c2354ac7ed Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Tue, 4 Nov 2008 16:17:27 +0000
Subject: fix: ArchiveReadRequest.URIFetch stumbles over absent content length
 field fix: region parameter in IRCBridgeModule XmlRpc was check for presence
 but not actually used...

---
 OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs      | 1 +
 .../Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment')

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
 
                 if (!requestData.ContainsKey("region"))
                     throw new Exception("No region name specified");
+                region = (string)requestData["region"];
                 
                 foreach (RegionState rs in m_regions)
                 {
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
             if (response.ContentLength == 0)
                 throw new Exception(String.Format("{0} returned an empty file", uri.ToString()));
 
-            return new BufferedStream(file, (int) response.ContentLength);
+            // return new BufferedStream(file, (int) response.ContentLength);
+            return new BufferedStream(file, 1000000);
 
         }
 
-- 
cgit v1.1