diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
commit | 5c73a908353cdd7210e3148f7162d30afab7873a (patch) | |
tree | 3ff858042b69b20a9eb3062b7cabd0c390e1b5cf /indra/llmessage/lliohttpserver.cpp | |
parent | 9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (diff) | |
parent | 5eee046bb7d62e24df6c35018b3c5383f87ab587 (diff) |
automated merge
Diffstat (limited to 'indra/llmessage/lliohttpserver.cpp')
-rw-r--r-- | indra/llmessage/lliohttpserver.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp index 97134bd336..27530fbfe1 100644 --- a/indra/llmessage/lliohttpserver.cpp +++ b/indra/llmessage/lliohttpserver.cpp @@ -74,7 +74,12 @@ class LLHTTPPipe : public LLIOPipe { public: LLHTTPPipe(const LLHTTPNode& node) - : mNode(node), mResponse(NULL), mState(STATE_INVOKE), mChainLock(0), mStatusCode(0) + : mNode(node), + mResponse(NULL), + mState(STATE_INVOKE), + mChainLock(0), + mLockedPump(NULL), + mStatusCode(0) { } virtual ~LLHTTPPipe() { @@ -111,7 +116,7 @@ private: void nullPipe(); private: - Response() {;} // Must be accessed through LLPointer. + Response() : mPipe(NULL) {} // Must be accessed through LLPointer. LLHTTPPipe* mPipe; }; friend class Response; @@ -403,7 +408,7 @@ void LLHTTPPipe::unlockChain() class LLHTTPResponseHeader : public LLIOPipe { public: - LLHTTPResponseHeader() {} + LLHTTPResponseHeader() : mCode(0) {} virtual ~LLHTTPResponseHeader() {} protected: |