From d51bd95a1f9cdeae22f330389c5213a1093eb971 Mon Sep 17 00:00:00 2001 From: "dolphin@dolphin-THINK.home" Date: Tue, 13 Nov 2012 08:24:18 -0800 Subject: Added a simple ui for displaying experiences keys with hardcoded contents. --- indra/newview/llfloaterexperiences.h | 45 ++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 indra/newview/llfloaterexperiences.h (limited to 'indra/newview/llfloaterexperiences.h') diff --git a/indra/newview/llfloaterexperiences.h b/indra/newview/llfloaterexperiences.h new file mode 100644 index 0000000000..1e5f216f8d --- /dev/null +++ b/indra/newview/llfloaterexperiences.h @@ -0,0 +1,45 @@ +/** + * @file llfloaterexperiences.h + * @brief LLFloaterExperiences class definition + * + * $LicenseInfo:firstyear=2012&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2012, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_LLFLOATEREXPERIENCES_H +#define LL_LLFLOATEREXPERIENCES_H + +#include "llfloater.h" + +class LLFloaterExperiences : + public LLFloater +{ +public: + LLFloaterExperiences(const LLSD& data); + +protected: + /*virtual*/ BOOL postBuild(); + +private: + +}; + +#endif //LL_LLFLOATEREXPERIENCES_H -- cgit v1.2.3 From e510fa3ee064ce03a48852fdea26be781e8fa8b6 Mon Sep 17 00:00:00 2001 From: dolphin Date: Thu, 3 Oct 2013 12:59:44 -0700 Subject: First pass at functional experience list floater --- indra/newview/llfloaterexperiences.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llfloaterexperiences.h') diff --git a/indra/newview/llfloaterexperiences.h b/indra/newview/llfloaterexperiences.h index 1e5f216f8d..7d8c4a4be7 100644 --- a/indra/newview/llfloaterexperiences.h +++ b/indra/newview/llfloaterexperiences.h @@ -35,9 +35,14 @@ class LLFloaterExperiences : public: LLFloaterExperiences(const LLSD& data); + void clearFromRecent(const LLSD& ids); protected: /*virtual*/ BOOL postBuild(); + void setupRecentTabs(); + void addTab(const std::string& name, bool select); + + private: }; -- cgit v1.2.3 From 1aed2f848c4f2a86d6c2ea6385ebb920e7658aa8 Mon Sep 17 00:00:00 2001 From: dolphin Date: Tue, 15 Oct 2013 16:42:55 -0700 Subject: Added LLTabContainer::getTotalTabWidth Cleaned up experience profile floater --- indra/newview/llfloaterexperiences.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llfloaterexperiences.h') diff --git a/indra/newview/llfloaterexperiences.h b/indra/newview/llfloaterexperiences.h index 7d8c4a4be7..01a0f4c551 100644 --- a/indra/newview/llfloaterexperiences.h +++ b/indra/newview/llfloaterexperiences.h @@ -36,9 +36,15 @@ public: LLFloaterExperiences(const LLSD& data); void clearFromRecent(const LLSD& ids); + void resizeToTabs(); + protected: /*virtual*/ BOOL postBuild(); + void refreshContents(); + + + void setupRecentTabs(); void addTab(const std::string& name, bool select); -- cgit v1.2.3 From 309ffd57fade231c3d14eedfe1171788e250f088 Mon Sep 17 00:00:00 2001 From: dolphin Date: Tue, 22 Oct 2013 10:51:53 -0700 Subject: Post events on experience permission changes to refresh uis --- indra/newview/llfloaterexperiences.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'indra/newview/llfloaterexperiences.h') diff --git a/indra/newview/llfloaterexperiences.h b/indra/newview/llfloaterexperiences.h index 01a0f4c551..27b453042b 100644 --- a/indra/newview/llfloaterexperiences.h +++ b/indra/newview/llfloaterexperiences.h @@ -33,21 +33,19 @@ class LLFloaterExperiences : public LLFloater { public: - LLFloaterExperiences(const LLSD& data); + LLFloaterExperiences(const LLSD& data); + virtual void onClose(bool app_quitting); + virtual void onOpen(const LLSD& key); +protected: void clearFromRecent(const LLSD& ids); void resizeToTabs(); - -protected: /*virtual*/ BOOL postBuild(); - void refreshContents(); - - - void setupRecentTabs(); void addTab(const std::string& name, bool select); + bool updatePermissions(const LLSD& permission); private: -- cgit v1.2.3 From c1f730ed46c14c12d5856109b622bf085c39abb0 Mon Sep 17 00:00:00 2001 From: dolphin Date: Wed, 26 Feb 2014 17:32:21 -0800 Subject: Moved the experience acquire code to the experiences panel --- indra/newview/llfloaterexperiences.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterexperiences.h') diff --git a/indra/newview/llfloaterexperiences.h b/indra/newview/llfloaterexperiences.h index 27b453042b..bb2de2f0db 100644 --- a/indra/newview/llfloaterexperiences.h +++ b/indra/newview/llfloaterexperiences.h @@ -29,6 +29,8 @@ #include "llfloater.h" +class LLPanelExperiences; + class LLFloaterExperiences : public LLFloater { @@ -43,9 +45,10 @@ protected: /*virtual*/ BOOL postBuild(); void refreshContents(); void setupRecentTabs(); - void addTab(const std::string& name, bool select); + LLPanelExperiences* addTab(const std::string& name, bool select); bool updatePermissions(const LLSD& permission); + void sendPurchaseRequest() const; private: -- cgit v1.2.3 From bb5e0f7877d06f10cd9ba82bc596a072427306b2 Mon Sep 17 00:00:00 2001 From: dolphin Date: Fri, 9 May 2014 10:26:06 -0700 Subject: Enable the experience purchase button based on the sim providing purchase info. --- indra/newview/llfloaterexperiences.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterexperiences.h') diff --git a/indra/newview/llfloaterexperiences.h b/indra/newview/llfloaterexperiences.h index bb2de2f0db..f1a0f49245 100644 --- a/indra/newview/llfloaterexperiences.h +++ b/indra/newview/llfloaterexperiences.h @@ -49,6 +49,7 @@ protected: bool updatePermissions(const LLSD& permission); void sendPurchaseRequest() const; + void checkPurchaseInfo(LLPanelExperiences* panel, const LLSD& content)const; private: -- cgit v1.2.3 From f3288e268529d897f1a65443042c7d828b9e1090 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Fri, 21 Nov 2014 12:40:30 +0200 Subject: ACME-1620 FIXED Newly acquired experience does not always show in Experience floater after being created --- indra/newview/llfloaterexperiences.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llfloaterexperiences.h') diff --git a/indra/newview/llfloaterexperiences.h b/indra/newview/llfloaterexperiences.h index f1a0f49245..769283ff07 100644 --- a/indra/newview/llfloaterexperiences.h +++ b/indra/newview/llfloaterexperiences.h @@ -39,6 +39,7 @@ public: virtual void onClose(bool app_quitting); virtual void onOpen(const LLSD& key); + static LLFloaterExperiences* findInstance(); protected: void clearFromRecent(const LLSD& ids); void resizeToTabs(); @@ -50,6 +51,7 @@ protected: bool updatePermissions(const LLSD& permission); void sendPurchaseRequest() const; void checkPurchaseInfo(LLPanelExperiences* panel, const LLSD& content)const; + void updateInfo(std::string experiences, std::string tab); private: -- cgit v1.2.3