From 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sun, 21 Jun 2009 08:04:56 +0000 Subject: merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 ignore-dead-branch --- indra/newview/llpanellandmarks.h | 61 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 indra/newview/llpanellandmarks.h (limited to 'indra/newview/llpanellandmarks.h') diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h new file mode 100644 index 0000000000..0f400a722e --- /dev/null +++ b/indra/newview/llpanellandmarks.h @@ -0,0 +1,61 @@ +/** + * @file llpanellandmarks.h + * @brief Landmarks tab for Side Bar "Places" panel + * class definition + * + * $LicenseInfo:firstyear=2009&license=viewergpl$ + * + * Copyright (c) 2001-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_LLPANELLANDMARKS_H +#define LL_LLPANELLANDMARKS_H + +#include "llinventoryview.h" +#include "llinventorymodel.h" +#include "llpanelplacestab.h" + +class LLLandmarksPanel : public LLPanelPlacesTab +{ +public: + LLLandmarksPanel(); + virtual ~LLLandmarksPanel(); + + /*virtual*/ BOOL postBuild(); + /*virtual*/ void onSearchEdit(const std::string& string); + /*virtual*/ void onShowOnMap(); + /*virtual*/ void onTeleport(); + ///*virtual*/ void onCopySLURL(); + + void onSelectionChange(const std::deque &items, BOOL user_action); + void onSelectorButtonClicked(); + +private: + LLInventoryPanel* mInventoryPanel; + LLSaveFolderState* mSavedFolderState; + LLButton* mActionBtn; +}; + +#endif //LL_LLPANELLANDMARKS_H -- cgit v1.2.3 From 39905b927d60e204438705728d2c214cb3f9ef81 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 2 Jul 2009 00:38:13 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4 --- indra/newview/llpanellandmarks.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanellandmarks.h') diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index 0f400a722e..76333e4d85 100644 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -48,6 +48,7 @@ public: /*virtual*/ void onShowOnMap(); /*virtual*/ void onTeleport(); ///*virtual*/ void onCopySLURL(); + /*virtual*/ void updateVerbs(); void onSelectionChange(const std::deque &items, BOOL user_action); void onSelectorButtonClicked(); -- cgit v1.2.3 From 52aeaa32841e7d0b37abab0a2a2540c2be2f16b7 Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 7 Jul 2009 00:53:05 +0000 Subject: Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14 --- indra/newview/llpanellandmarks.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanellandmarks.h') diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index 76333e4d85..8889a99925 100644 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -33,7 +33,7 @@ #ifndef LL_LLPANELLANDMARKS_H #define LL_LLPANELLANDMARKS_H -#include "llinventoryview.h" +#include "llfloaterinventory.h" #include "llinventorymodel.h" #include "llpanelplacestab.h" -- cgit v1.2.3 From 73a97010e6c8c7874fdc1778ab46e492f77d9394 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 21 Jul 2009 00:57:23 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 --- indra/newview/llpanellandmarks.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanellandmarks.h') diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index 8889a99925..0b11270fb5 100644 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -52,6 +52,7 @@ public: void onSelectionChange(const std::deque &items, BOOL user_action); void onSelectorButtonClicked(); + void setSelectedItem(const LLUUID& obj_id); private: LLInventoryPanel* mInventoryPanel; -- cgit v1.2.3 From 0aa2bc4831674e61edf680887eba9acec9f997ed Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 28 Aug 2009 22:58:17 +0000 Subject: svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2 Bug Fixes: * EXT-637 EXT-595 Dev work: * EXT-694 QA: * Be sure feature works on other locales Known issues: * If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts. * It is possible to create 2 deep level subfolders under the Calling Cards/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy. * If friendship is removed when agent is offline, Friend Card is not removed from Inventory. --- indra/newview/llpanellandmarks.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanellandmarks.h') diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index 0b11270fb5..14cbbd6123 100644 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -33,10 +33,13 @@ #ifndef LL_LLPANELLANDMARKS_H #define LL_LLPANELLANDMARKS_H -#include "llfloaterinventory.h" #include "llinventorymodel.h" #include "llpanelplacestab.h" +class LLFolderViewItem; +class LLInventoryPanel; +class LLSaveFolderState; + class LLLandmarksPanel : public LLPanelPlacesTab { public: -- cgit v1.2.3