From e045d212d35354d679c2d2e05c6d4689f9f8ac95 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 27 Sep 2010 22:56:08 -0400 Subject: STORM-1126 WIP Windlight Estate Settings port from 1.23: first pass at merging in windlight estate settings to viewer-dev codebase. not built, not tested. Probably needs a bunch of fixes to be able to be integrated. (resubmitted by Vadim ProductEngine) --- indra/newview/llwlhandlers.h | 89 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 indra/newview/llwlhandlers.h (limited to 'indra/newview/llwlhandlers.h') diff --git a/indra/newview/llwlhandlers.h b/indra/newview/llwlhandlers.h new file mode 100644 index 0000000000..a50404f2e1 --- /dev/null +++ b/indra/newview/llwlhandlers.h @@ -0,0 +1,89 @@ +/** + * @file llwlhandlers.h + * @brief Headers for classes in llwlhandlers.cpp + * + * $LicenseInfo:firstyear=2009&license=viewergpl$ + * + * Copyright (c) 2009, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + */ + +#ifndef LL_LLWLHANDLERS_H +#define LL_LLWLHANDLERS_H + +#include "llviewerprecompiledheaders.h" + +class LLEnvManager; + +class LLEnvironmentRequestResponder: public LLHTTPClient::Responder +{ +public: + virtual void result(const LLSD& content); + virtual void error(U32 status, const std::string& reason); + +private: + friend class LLEnvManager; + // returns true if request was sucessfully sent + static bool initiateRequest(); + + LLEnvironmentRequestResponder(); + static int sCount; + int mID; +}; + +class LLEnvironmentApplyResponder: public LLHTTPClient::Responder +{ +public: + /* + * Expecting reply from sim in form of: + * { + * regionID : uuid, + * messageID: uuid, + * success : true + * } + * or + * { + * regionID : uuid, + * success : false, + * fail_reason : string + * } + */ + virtual void result(const LLSD& content); + + virtual void error(U32 status, const std::string& reason); // non-200 errors only + +private: + friend class LLEnvManager; + + static clock_t sLastUpdate; + static clock_t UPDATE_WAIT_SECONDS; + + // for format of packet expected, see llwlscrubbers.cpp in llmessage + static bool initiateRequest(const LLSD& packet); + + LLEnvironmentApplyResponder() {} +}; + +#endif // LL_LLWLHANDLERS_H -- cgit v1.2.3 From 2fb337bc12984f9abecfbc7f3918c372a7b5ac6c Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 30 Sep 2010 23:21:23 -0400 Subject: STORM-1126 WIP Windlight Estate Settings port from 1.23: second pass at getting windlight ported to V2. Lots of cleanup in the floater classes. Not sure every decision was correct but it compiles now. Doesn't link yet. (resubmitted by Vadim ProductEngine) --- indra/newview/llwlhandlers.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llwlhandlers.h') diff --git a/indra/newview/llwlhandlers.h b/indra/newview/llwlhandlers.h index a50404f2e1..811dc4bb73 100644 --- a/indra/newview/llwlhandlers.h +++ b/indra/newview/llwlhandlers.h @@ -34,6 +34,7 @@ #define LL_LLWLHANDLERS_H #include "llviewerprecompiledheaders.h" +#include "llhttpclient.h" class LLEnvManager; -- cgit v1.2.3 From 19f356202a9516664c1cacb9b50e9b6e1e072375 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Tue, 12 Apr 2011 22:07:59 +0300 Subject: 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. --- indra/newview/llwlhandlers.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'indra/newview/llwlhandlers.h') 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; -- cgit v1.2.3 From 348218e40f362d386a0175d4b010b639282764b2 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Tue, 17 May 2011 16:26:55 +0300 Subject: STORM-1245 WIP Restored environment settings interpolation on region crossing. Also got rid of duplicated region environment settings requests. --- indra/newview/llwlhandlers.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llwlhandlers.h') diff --git a/indra/newview/llwlhandlers.h b/indra/newview/llwlhandlers.h index 4929b4d27b..05b2244e8a 100644 --- a/indra/newview/llwlhandlers.h +++ b/indra/newview/llwlhandlers.h @@ -40,6 +40,7 @@ class LLEnvManager; class LLEnvironmentRequest { + LOG_CLASS(LLEnvironmentRequest); public: /// @return true if request was successfully sent static bool initiate(); @@ -51,6 +52,7 @@ private: class LLEnvironmentRequestResponder: public LLHTTPClient::Responder { + LOG_CLASS(LLEnvironmentRequestResponder); public: virtual void result(const LLSD& content); virtual void error(U32 status, const std::string& reason); @@ -66,6 +68,7 @@ private: class LLEnvironmentApplyResponder: public LLHTTPClient::Responder { + LOG_CLASS(LLEnvironmentApplyResponder); public: /* * Expecting reply from sim in form of: -- cgit v1.2.3 From b60c63bf075a92084ba94459a840decba846a916 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Mon, 23 May 2011 19:26:17 +0300 Subject: STORM-1256 WIP Implemented editing region environment settings via the Region/Estate floater. --- indra/newview/llwlhandlers.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'indra/newview/llwlhandlers.h') diff --git a/indra/newview/llwlhandlers.h b/indra/newview/llwlhandlers.h index 05b2244e8a..b5eb62b0b0 100644 --- a/indra/newview/llwlhandlers.h +++ b/indra/newview/llwlhandlers.h @@ -66,6 +66,18 @@ private: int mID; }; +class LLEnvironmentApply +{ + LOG_CLASS(LLEnvironmentApply); +public: + /// @return true if request was successfully sent + static bool initiateRequest(const LLSD& content); + +private: + static clock_t sLastUpdate; + static clock_t UPDATE_WAIT_SECONDS; +}; + class LLEnvironmentApplyResponder: public LLHTTPClient::Responder { LOG_CLASS(LLEnvironmentApplyResponder); @@ -89,14 +101,8 @@ public: virtual void error(U32 status, const std::string& reason); // non-200 errors only private: - friend class LLEnvManager; + friend class LLEnvironmentApply; - static clock_t sLastUpdate; - static clock_t UPDATE_WAIT_SECONDS; - - // for format of packet expected, see llwlscrubbers.cpp in llmessage - static bool initiateRequest(const LLSD& packet); - LLEnvironmentApplyResponder() {} }; -- cgit v1.2.3 From 31c1cff64fe6e963722e580c8779d69cef4b14ba Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Wed, 6 Jul 2011 00:42:28 +0300 Subject: STORM-1262 FIXED Removed the original Windlight Region Settings implementation. --- indra/newview/llwlhandlers.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/newview/llwlhandlers.h') diff --git a/indra/newview/llwlhandlers.h b/indra/newview/llwlhandlers.h index b5eb62b0b0..213bc7c7ce 100644 --- a/indra/newview/llwlhandlers.h +++ b/indra/newview/llwlhandlers.h @@ -36,8 +36,6 @@ #include "llviewerprecompiledheaders.h" #include "llhttpclient.h" -class LLEnvManager; - class LLEnvironmentRequest { LOG_CLASS(LLEnvironmentRequest); @@ -59,7 +57,6 @@ public: private: friend class LLEnvironmentRequest; - friend class LLEnvManager; LLEnvironmentRequestResponder(); static int sCount; -- cgit v1.2.3