diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-09-14 13:33:50 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-09-14 13:33:50 -0700 |
| commit | 32912a395839712b4edd4f39737d116f1730f5bf (patch) | |
| tree | 4f3675797fda09c2c2789fa375f38bf8edc24b30 /indra/llmessage/llcurl.h | |
| parent | 97236a42ca08979897d5c7b0826312345754cd67 (diff) | |
MAINT-5507: Test checkin with RPC code and URL request disabled. Make sure it does not break non windows builds.
Diffstat (limited to 'indra/llmessage/llcurl.h')
| -rwxr-xr-x | indra/llmessage/llcurl.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h index 06b3ce45e1..ca70462d0e 100755 --- a/indra/llmessage/llcurl.h +++ b/indra/llmessage/llcurl.h @@ -284,7 +284,9 @@ public: private: friend class LLCurl; +#if 1 friend class LLCurl::Multi; +#endif CURL* mCurlEasyHandle; struct curl_slist* mHeaders; @@ -309,6 +311,7 @@ private: static void deleteAllFreeHandles(); }; +#if 1 class LLCurl::Multi { LOG_CLASS(Multi); @@ -379,7 +382,9 @@ private: LLFrameTimer mIdleTimer ; F32 mIdleTimeOut; }; +#endif +#if 1 class LLCurlThread : public LLQueuedThread { public: @@ -416,6 +421,7 @@ private: void deleteMulti(LLCurl::Multi* multi) ; void cleanupMulti(LLCurl::Multi* multi) ; } ; +#endif class LLCurlEasyRequest @@ -436,17 +442,24 @@ public: void requestComplete(); bool getResult(CURLcode* result, LLCurl::TransferInfo* info = NULL); std::string getErrorString(); +#if 0 + bool isCompleted() { return false; } + bool wait() { return false; } + bool isValid() { return false; } +#else bool isCompleted() {return mMulti->isCompleted() ;} bool wait() { return mMulti->waitToComplete(); } bool isValid() {return mMulti && mMulti->isValid(); } - +#endif LLCurl::Easy* getEasy() const { return mEasy; } private: CURLMsg* info_read(S32* queue, LLCurl::TransferInfo* info); private: +#if 1 LLCurl::Multi* mMulti; +#endif LLCurl::Easy* mEasy; bool mRequestSent; bool mResultReturned; |