Merge branch 'master' into DRTVWR-497

1 files changed, 9 insertions, 6 deletions

diff --git a/indra/newview/llwlhandlers.h b/indra/newview/llwlhandlers.h
index eb2bbf9553..b09d2df60f 100644
--- a/indra/newview/llwlhandlers.h
+++ b/indra/newview/llwlhandlers.h
@@ -29,19 +29,20 @@
 
 #include "llviewerprecompiledheaders.h"
 #include "llcoros.h"
+#include "llenvironment.h"
 
 class LLEnvironmentRequest
 {
 	LOG_CLASS(LLEnvironmentRequest);
 public:
 	/// @return true if request was successfully sent
-	static bool initiate();
+    static bool initiate(LLEnvironment::environment_apply_fn cb);
 
 private:
-	static void onRegionCapsReceived(const LLUUID& region_id);
-	static bool doRequest();
+    static void onRegionCapsReceived(const LLUUID& region_id, LLEnvironment::environment_apply_fn cb);
+    static bool doRequest(LLEnvironment::environment_apply_fn cb);
 
-    static void environmentRequestCoro(std::string url);
+    static void environmentRequestCoro(std::string url, LLEnvironment::environment_apply_fn cb);
 
     static S32 sLastRequest;
 };
@@ -51,13 +52,15 @@ class LLEnvironmentApply
 	LOG_CLASS(LLEnvironmentApply);
 public:
 	/// @return true if request was successfully sent
-	static bool initiateRequest(const LLSD& content);
+    static bool initiateRequest(const LLSD& content, LLEnvironment::environment_apply_fn cb);
 
 private:
 	static clock_t sLastUpdate;
 	static clock_t UPDATE_WAIT_SECONDS;
 
-    static void environmentApplyCoro(std::string url, LLSD content);
+    static void environmentApplyCoro(std::string url, LLSD content, LLEnvironment::environment_apply_fn cb);
 };
 
+
+
 #endif // LL_LLWLHANDLERS_H