2 files changed, 14 insertions, 11 deletions

diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index c26ef5e..7c7fe59 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2009, Linden Research, Inc.
+ * Copyright (c) 2006-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -161,10 +161,9 @@ namespace
                                 fstream.seekg(0, std::ios::end);
                                 U32 fileSize = fstream.tellg();
                                 fstream.seekg(0, std::ios::beg);
-                                char* fileBuffer;
-                                fileBuffer = new char [fileSize];
-                                fstream.read(fileBuffer, fileSize);
-                                ostream.write(fileBuffer, fileSize);
+                                std::vector<char> fileBuffer(fileSize);
+                                fstream.read(&fileBuffer[0], fileSize);
+                                ostream.write(&fileBuffer[0], fileSize);
                                 fstream.close();
                                 eos = true;
                                 return STATUS_DONE;
@@ -191,11 +190,9 @@ namespace
                         
                         LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ);
                         S32 fileSize = vfile.getSize();
-                        U8* fileBuffer;
-                        fileBuffer = new U8 [fileSize];
-                        vfile.read(fileBuffer, fileSize);
-                        ostream.write((char*)fileBuffer, fileSize);
-                        delete [] fileBuffer; 
+                        std::vector<U8> fileBuffer(fileSize);
+                        vfile.read(&fileBuffer[0], fileSize);
+                        ostream.write((char*)&fileBuffer[0], fileSize);
                         eos = true;
                         return STATUS_DONE;
                 }
@@ -528,3 +525,8 @@ bool LLHTTPClient::hasPump()
 {
         return theClientPump != NULL;
 }
+
+LLPumpIO &LLHTTPClient::getPump()
+{
+        return *theClientPump;
+}
diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index a0c9fac..ab8afe8 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2009, Linden Research, Inc.
+ * Copyright (c) 2006-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -148,6 +148,7 @@ public:
                 ///< must be called before any of the above calls are made
         static bool hasPump();
                 ///< for testing
+        static LLPumpIO &getPump();
 };
 
 #endif // LL_LLHTTPCLIENT_H