diff options
| -rw-r--r-- | etc/message.xml | 2 | ||||
| -rw-r--r-- | indra/llmessage/llurlrequest.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/etc/message.xml b/etc/message.xml index af3db1d9ad..c6875cdcc9 100644 --- a/etc/message.xml +++ b/etc/message.xml @@ -537,7 +537,7 @@ <boolean>false</boolean> <key>EstateChangeInfo</key> - <boolean>false</boolean> + <boolean>true</boolean> <key>FetchInventoryDescendents</key> <boolean>true</boolean> diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index db67fbeea7..b5b45c557e 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -64,6 +64,7 @@ public: LLURLRequestDetail(); ~LLURLRequestDetail(); std::string mURL; + std::string mProxy; LLCurlEasyRequest* mCurlRequest; LLBufferArray* mResponseBuffer; LLChannelDescriptors mChannels; @@ -194,7 +195,11 @@ void LLURLRequest::useProxy(bool use_proxy) void LLURLRequest::useProxy(const std::string &proxy) { - curl_easy_setopt(mDetail->mCurlRequest, CURLOPT_PROXY, proxy.c_str()); + mDetail->mProxy = proxy; + curl_easy_setopt( + mDetail->mCurlRequest, + CURLOPT_PROXY, + mDetail->mProxy.c_str()); } // virtual |