diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2012-01-04 14:15:05 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2012-01-04 14:15:05 -0700 |
| commit | 4405910caa34446a19f66cfc35a9270a0e14292f (patch) | |
| tree | 23e41968b44d5ac7aaffdfe02d2c5c0ddf6f95f7 /indra/llmessage | |
| parent | a3e30250e8dc16d976e1df5d50bfdca28aec6d7e (diff) | |
| parent | 94ad019ce3387b9c5207fe3207933697059dd2dd (diff) | |
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llurlrequest.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index a3a2b2b1b8..261e57e79e 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -64,7 +64,7 @@ public: ~LLURLRequestDetail(); std::string mURL; LLCurlEasyRequest* mCurlRequest; - LLBufferArray* mResponseBuffer; + LLIOPipe::buffer_ptr_t mResponseBuffer; LLChannelDescriptors mChannels; U8* mLastRead; U32 mBodyLimit; @@ -75,7 +75,6 @@ public: LLURLRequestDetail::LLURLRequestDetail() : mCurlRequest(NULL), - mResponseBuffer(NULL), mLastRead(NULL), mBodyLimit(0), mByteAccumulator(0), @@ -90,7 +89,6 @@ LLURLRequestDetail::~LLURLRequestDetail() { LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST); delete mCurlRequest; - mResponseBuffer = NULL; mLastRead = NULL; } @@ -326,7 +324,7 @@ LLIOPipe::EStatus LLURLRequest::process_impl( // *FIX: bit of a hack, but it should work. The configure and // callback method expect this information to be ready. - mDetail->mResponseBuffer = buffer.get(); + mDetail->mResponseBuffer = buffer; mDetail->mChannels = channels; if(!configure()) { |