STORM-1143 FIXED Server sometimes said region wasn't capable of storing environment settings.

Reason: We tried to check whether the region supports environment settings
without making sure that we've actually recieved region capabilities,
so the check sometimes failed.

Fix: Defer check for the "EnvironmentSettings" capability until we've received the region capabilities.

1 files changed, 12 insertions, 2 deletions

diff --git a/indra/newview/llwlhandlers.h b/indra/newview/llwlhandlers.h
index 811dc4bb73..4929b4d27b 100644
--- a/indra/newview/llwlhandlers.h
+++ b/indra/newview/llwlhandlers.h
@@ -38,6 +38,17 @@
 
 class LLEnvManager;
 
+class LLEnvironmentRequest
+{
+public:
+	/// @return true if request was successfully sent
+	static bool initiate();
+
+private:
+	static void onRegionCapsReceived(const LLUUID& region_id);
+	static bool doRequest();
+};
+
 class LLEnvironmentRequestResponder: public LLHTTPClient::Responder
 {
 public:
@@ -45,9 +56,8 @@ public:
 	virtual void error(U32 status, const std::string& reason);
 
 private:
+	friend class LLEnvironmentRequest;
 	friend class LLEnvManager;
-	// returns true if request was sucessfully sent
-	static bool initiateRequest();
 
 	LLEnvironmentRequestResponder();
 	static int sCount;