From 257110c11e5546f0a5a07b087694cfc9059367b4 Mon Sep 17 00:00:00 2001 From: dolphin Date: Wed, 21 Aug 2013 15:43:09 -0700 Subject: Added new fields to the experience cache. Experience profile moved to it's own floater, will probalby be moving again. XP profile displays most data, though the presentation is not final Fixed a bug with the XP selection combobox in the script editor --- indra/newview/llfloaterexperienceprofile.h | 70 ++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 indra/newview/llfloaterexperienceprofile.h (limited to 'indra/newview/llfloaterexperienceprofile.h') diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h new file mode 100644 index 0000000000..1d1e4c50cf --- /dev/null +++ b/indra/newview/llfloaterexperienceprofile.h @@ -0,0 +1,70 @@ +/** + * @file llfloaterexperienceprofile.h + * @brief llfloaterexperienceprofile and related class definitions + * + * $LicenseInfo:firstyear=2013&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2013, 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_LLFLOATEREXPERIENCEPROFILE_H +#define LL_LLFLOATEREXPERIENCEPROFILE_H + +#include "llfloater.h" +#include "lluuid.h" +#include "llsd.h" + +class LLLayoutPanel; + +class LLFloaterExperienceProfile : public LLFloater +{ + LOG_CLASS(LLFloaterExperienceProfile); +public: + LLFloaterExperienceProfile(const LLSD& data); + virtual ~LLFloaterExperienceProfile(); + + void setExperienceId( const LLUUID& experience_id ); + +protected: + + void onClickMap(); + void onClickTeleport(); + void onClickEdit(); + + + static void experienceCallback(LLHandle handle, const LLSD& experience); + void refreshExperience(const LLSD& experience); + BOOL postBuild(); + std::string getMaturityString(U8 maturity); + LLUUID mExperienceId; + LLSD mExperienceDetails; + + LLLayoutPanel* mImagePanel; + LLLayoutPanel* mDescriptionPanel; + LLLayoutPanel* mLocationPanel; + LLLayoutPanel* mMarketplacePanel; + +private: + +}; + +#endif // LL_LLFLOATEREXPERIENCEPROFILE_H -- cgit v1.2.3 From eaf847e60df3c078d15f8991e9448b06ffa83bf7 Mon Sep 17 00:00:00 2001 From: dolphin Date: Tue, 27 Aug 2013 16:37:08 -0700 Subject: experience profile work in progress --- indra/newview/llfloaterexperienceprofile.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'indra/newview/llfloaterexperienceprofile.h') diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h index 1d1e4c50cf..e19a63aca7 100644 --- a/indra/newview/llfloaterexperienceprofile.h +++ b/indra/newview/llfloaterexperienceprofile.h @@ -34,6 +34,7 @@ #include "llsd.h" class LLLayoutPanel; +class LLTextBox; class LLFloaterExperienceProfile : public LLFloater { @@ -45,16 +46,14 @@ public: void setExperienceId( const LLUUID& experience_id ); protected: - - void onClickMap(); - void onClickTeleport(); void onClickEdit(); static void experienceCallback(LLHandle handle, const LLSD& experience); + void refreshExperience(const LLSD& experience); BOOL postBuild(); - std::string getMaturityString(U8 maturity); + bool setMaturityString(U8 maturity, LLTextBox* child); LLUUID mExperienceId; LLSD mExperienceDetails; -- cgit v1.2.3 From df437553ede576df4e6a1c5e4a2e177f7d8275c2 Mon Sep 17 00:00:00 2001 From: dolphin Date: Tue, 3 Sep 2013 10:14:24 -0700 Subject: Updated experience profile floater to have permission buttons --- indra/newview/llfloaterexperienceprofile.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterexperienceprofile.h') diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h index e19a63aca7..c486ca5f30 100644 --- a/indra/newview/llfloaterexperienceprofile.h +++ b/indra/newview/llfloaterexperienceprofile.h @@ -44,9 +44,12 @@ public: virtual ~LLFloaterExperienceProfile(); void setExperienceId( const LLUUID& experience_id ); + void setPreferences( const LLSD& content ); protected: - void onClickEdit(); + void onClickEdit(); + void onClickPermission(const char* permission); + void onClickForget(); static void experienceCallback(LLHandle handle, const LLSD& experience); -- cgit v1.2.3 From ece98188a8e5c76adddf884886f44b6fc9c5ae21 Mon Sep 17 00:00:00 2001 From: dolphin Date: Fri, 6 Sep 2013 17:09:50 -0700 Subject: Added profile editing to the experience profile floater. --- indra/newview/llfloaterexperienceprofile.h | 31 ++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'indra/newview/llfloaterexperienceprofile.h') diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h index c486ca5f30..c32f274206 100644 --- a/indra/newview/llfloaterexperienceprofile.h +++ b/indra/newview/llfloaterexperienceprofile.h @@ -35,28 +35,47 @@ class LLLayoutPanel; class LLTextBox; +class LLComboBox; class LLFloaterExperienceProfile : public LLFloater { LOG_CLASS(LLFloaterExperienceProfile); public: + enum + { + NOTHING, + CLOSE, + VIEW, + }; + + LLFloaterExperienceProfile(const LLSD& data); virtual ~LLFloaterExperienceProfile(); - void setExperienceId( const LLUUID& experience_id ); + LLUUID getExperienceId() const { return mExperienceId; } void setPreferences( const LLSD& content ); + void refreshExperience(const LLSD& experience); + void onSaveComplete( const LLSD& content ); + virtual BOOL canClose(); protected: void onClickEdit(); void onClickPermission(const char* permission); void onClickForget(); + void onClickCancel(); + + void changeToView(); + void onClickSave(); + + void onFieldChanged(); static void experienceCallback(LLHandle handle, const LLSD& experience); - void refreshExperience(const LLSD& experience); BOOL postBuild(); - bool setMaturityString(U8 maturity, LLTextBox* child); + bool setMaturityString(U8 maturity, LLTextBox* child, LLComboBox* combo); + bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response, int action); + void doSave( int success_action ); LLUUID mExperienceId; LLSD mExperienceDetails; @@ -64,9 +83,9 @@ protected: LLLayoutPanel* mDescriptionPanel; LLLayoutPanel* mLocationPanel; LLLayoutPanel* mMarketplacePanel; - -private: - + int mSaveCompleteAction; + bool mDirty; + bool mForceClose; }; #endif // LL_LLFLOATEREXPERIENCEPROFILE_H -- cgit v1.2.3 From 51c01f5294b68b66706685346ecea16246b85cce Mon Sep 17 00:00:00 2001 From: dolphin Date: Mon, 9 Sep 2013 11:19:41 -0700 Subject: More explicitnexx for the mac build Also update the experience cache when the update returns. --- indra/newview/llfloaterexperienceprofile.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterexperienceprofile.h') diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h index c32f274206..1f1e135c01 100644 --- a/indra/newview/llfloaterexperienceprofile.h +++ b/indra/newview/llfloaterexperienceprofile.h @@ -41,7 +41,7 @@ class LLFloaterExperienceProfile : public LLFloater { LOG_CLASS(LLFloaterExperienceProfile); public: - enum + enum PostSaveAction { NOTHING, CLOSE, @@ -74,7 +74,7 @@ protected: BOOL postBuild(); bool setMaturityString(U8 maturity, LLTextBox* child, LLComboBox* combo); - bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response, int action); + bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response, PostSaveAction action); void doSave( int success_action ); LLUUID mExperienceId; LLSD mExperienceDetails; -- cgit v1.2.3 From f5b7343238626f52ea45ee74ed06294ae1f22a74 Mon Sep 17 00:00:00 2001 From: dolphin Date: Tue, 17 Sep 2013 19:58:20 -0700 Subject: Updated position of the edit button the experience profile and added the Grid Wide tag. --- indra/newview/llfloaterexperienceprofile.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'indra/newview/llfloaterexperienceprofile.h') diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h index 1f1e135c01..4aa9820a91 100644 --- a/indra/newview/llfloaterexperienceprofile.h +++ b/indra/newview/llfloaterexperienceprofile.h @@ -78,11 +78,6 @@ protected: void doSave( int success_action ); LLUUID mExperienceId; LLSD mExperienceDetails; - - LLLayoutPanel* mImagePanel; - LLLayoutPanel* mDescriptionPanel; - LLLayoutPanel* mLocationPanel; - LLLayoutPanel* mMarketplacePanel; int mSaveCompleteAction; bool mDirty; bool mForceClose; -- 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/llfloaterexperienceprofile.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/llfloaterexperienceprofile.h') diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h index 4aa9820a91..feaff0547e 100644 --- a/indra/newview/llfloaterexperienceprofile.h +++ b/indra/newview/llfloaterexperienceprofile.h @@ -63,13 +63,13 @@ protected: void onClickPermission(const char* permission); void onClickForget(); void onClickCancel(); - - void changeToView(); - void onClickSave(); - + void onClickLocation(); + void onClickClear(); void onFieldChanged(); + void changeToView(); + static void experienceCallback(LLHandle handle, const LLSD& experience); BOOL postBuild(); -- 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/llfloaterexperienceprofile.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/llfloaterexperienceprofile.h') diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h index feaff0547e..83ad75913f 100644 --- a/indra/newview/llfloaterexperienceprofile.h +++ b/indra/newview/llfloaterexperienceprofile.h @@ -54,10 +54,13 @@ public: LLUUID getExperienceId() const { return mExperienceId; } void setPreferences( const LLSD& content ); + + void refreshExperience(const LLSD& experience); void onSaveComplete( const LLSD& content ); virtual BOOL canClose(); + virtual void onClose(bool app_quitting); protected: void onClickEdit(); void onClickPermission(const char* permission); @@ -70,12 +73,18 @@ protected: void changeToView(); + void experienceForgotten(); + void experienceBlocked(); + void experienceAllowed(); + static void experienceCallback(LLHandle handle, const LLSD& experience); + static bool experiencePermission(LLHandle handle, const LLSD& permission); BOOL postBuild(); bool setMaturityString(U8 maturity, LLTextBox* child, LLComboBox* combo); bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response, PostSaveAction action); void doSave( int success_action ); + void updatePermission( const LLSD& permission ); LLUUID mExperienceId; LLSD mExperienceDetails; int mSaveCompleteAction; -- cgit v1.2.3 From 1d8066890df4d8de9e60970037282beb9818788c Mon Sep 17 00:00:00 2001 From: dolphin Date: Fri, 25 Oct 2013 14:04:24 -0700 Subject: Make the experience profile save button enable and disable as changes are made/reverted. Added some explanation text. --- indra/newview/llfloaterexperienceprofile.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llfloaterexperienceprofile.h') diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h index 83ad75913f..550b3c6f27 100644 --- a/indra/newview/llfloaterexperienceprofile.h +++ b/indra/newview/llfloaterexperienceprofile.h @@ -84,9 +84,13 @@ protected: bool setMaturityString(U8 maturity, LLTextBox* child, LLComboBox* combo); bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response, PostSaveAction action); void doSave( int success_action ); + + void updatePackage(); + void updatePermission( const LLSD& permission ); LLUUID mExperienceId; LLSD mExperienceDetails; + LLSD mPackage; int mSaveCompleteAction; bool mDirty; bool mForceClose; -- cgit v1.2.3 From 49f08d775d3644bb47d342f8e37dd15051aeaa62 Mon Sep 17 00:00:00 2001 From: dolphin Date: Fri, 28 Feb 2014 16:21:42 -0800 Subject: Add group editing for experiences --- indra/newview/llfloaterexperienceprofile.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterexperienceprofile.h') diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h index 550b3c6f27..5e9fd8f03a 100644 --- a/indra/newview/llfloaterexperienceprofile.h +++ b/indra/newview/llfloaterexperienceprofile.h @@ -68,9 +68,12 @@ protected: void onClickCancel(); void onClickSave(); void onClickLocation(); - void onClickClear(); + void onClickClear(); + void onPickGroup(); void onFieldChanged(); + void setEditGroup(LLUUID group_id); + void changeToView(); void experienceForgotten(); -- cgit v1.2.3 From e10ae3ba960cf030582378c454937dd326fcd436 Mon Sep 17 00:00:00 2001 From: dolphin Date: Thu, 13 Mar 2014 15:10:51 -0700 Subject: Added a Report Abuse button to the experience profile --- indra/newview/llfloaterexperienceprofile.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterexperienceprofile.h') diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h index 5e9fd8f03a..b66df49a8a 100644 --- a/indra/newview/llfloaterexperienceprofile.h +++ b/indra/newview/llfloaterexperienceprofile.h @@ -70,7 +70,8 @@ protected: void onClickLocation(); void onClickClear(); void onPickGroup(); - void onFieldChanged(); + void onFieldChanged(); + void onReportExperience(); void setEditGroup(LLUUID group_id); -- cgit v1.2.3 From 3b2f456416d29534cb41fc9d4ad3bf195dcfc847 Mon Sep 17 00:00:00 2001 From: Cho Date: Fri, 18 Jul 2014 01:45:48 +0100 Subject: Added mLocationSLURL to fix ACME-1560 --- indra/newview/llfloaterexperienceprofile.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterexperienceprofile.h') diff --git a/indra/newview/llfloaterexperienceprofile.h b/indra/newview/llfloaterexperienceprofile.h index b66df49a8a..78d54eb447 100644 --- a/indra/newview/llfloaterexperienceprofile.h +++ b/indra/newview/llfloaterexperienceprofile.h @@ -95,6 +95,7 @@ protected: LLUUID mExperienceId; LLSD mExperienceDetails; LLSD mPackage; + std::string mLocationSLURL; int mSaveCompleteAction; bool mDirty; bool mForceClose; -- cgit v1.2.3