diff --git a/etc/message.xml b/etc/message.xml
index af3db1d9ad1d661890255ce0d92f10848e5aa833..c6875cdcc9a7f1386748fcf0dd87ffb6d2a65828 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 db67fbeea710213dc600120acd90bf0bb888e9c4..b5b45c557e7f205a36ff56afaa944e21eac78188 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