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/llpanelprofileview.cpp | 112 +++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 indra/newview/llpanelprofileview.cpp (limited to 'indra/newview/llpanelprofileview.cpp') diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp new file mode 100644 index 0000000000..457397a379 --- /dev/null +++ b/indra/newview/llpanelprofileview.cpp @@ -0,0 +1,112 @@ +/** +* @file llpanelprofileview.cpp +* @brief Side tray "Profile View" panel +* +* $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$ +*/ + +#include "llviewerprecompiledheaders.h" +#include "llpanelprofileview.h" +#include +#include +#include +#include "llpanelavatar.h" +#include "llpanelpicks.h" + +static LLRegisterPanelClassWrapper t_panel_target_profile("panel_profile_view"); +static LLRegisterPanelClassWrapper t_panel_notes("panel_notes"); + +static std::string PANEL_PROFILE = "panel_profile"; +static std::string PANEL_PICKS = "panel_picks"; +static std::string PANEL_NOTES = "panel_notes"; + +LLPanelProfileView::LLPanelProfileView(const LLPanel::Params& p) +: LLPanel(p) +{ +} + +LLPanelProfileView::~LLPanelProfileView(void) +{ +} + +/*virtual*/ +void LLPanelProfileView::onOpen(const LLSD& key) +{ + if (!getVisible()) + setVisible(TRUE); + + LLUUID id(key.asUUID()); + if(id.notNull() && mProfileId.notNull() && mProfileId != id) + { + mTabs[PANEL_PROFILE]->clear(); + mTabs[PANEL_PICKS]->clear(); + mTabs[PANEL_NOTES]->clear(); + } + + mProfileId = id; + mTabs[PANEL_PROFILE]->onOpen(mProfileId); + mTabs[PANEL_PICKS]->setAvatarId(mProfileId); + mTabs[PANEL_PICKS]->updateData(); + mTabs[PANEL_NOTES]->setAvatarId(mProfileId); + mTabs[PANEL_NOTES]->updateData(); + + std::string full_name; + gCacheName->getFullName(key,full_name); + childSetValue("user_name",full_name); +} + + +BOOL LLPanelProfileView::postBuild() +{ + mTabContainer = getChild("profile_tabs"); + mTabContainer->setCommitCallback(boost::bind(&LLPanelProfileView::onTabSelected, this, _2)); + + mTabs[PANEL_PROFILE] = (getChild(PANEL_PROFILE)); + mTabs[PANEL_PICKS] = (getChild(PANEL_PICKS)); + mTabs[PANEL_NOTES] = (getChild(PANEL_NOTES)); + + childSetCommitCallback("back",boost::bind(&LLPanelProfileView::onBackBtnClick,this),NULL); + + return TRUE; +} + + +//private + +void LLPanelProfileView::initTabs(const LLSD& key) +{ +} + +void LLPanelProfileView::onTabSelected(const LLSD& param) +{ +} + +void LLPanelProfileView::onBackBtnClick() +{ + setVisible(FALSE); +} -- cgit v1.2.3 From ade6bbb06c6a842f39a3fe32decf7c66682df092 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sun, 21 Jun 2009 17:16:27 +0000 Subject: merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3 --- indra/newview/llpanelprofileview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelprofileview.cpp') diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp index 457397a379..0d25272f88 100644 --- a/indra/newview/llpanelprofileview.cpp +++ b/indra/newview/llpanelprofileview.cpp @@ -45,8 +45,8 @@ static std::string PANEL_PROFILE = "panel_profile"; static std::string PANEL_PICKS = "panel_picks"; static std::string PANEL_NOTES = "panel_notes"; -LLPanelProfileView::LLPanelProfileView(const LLPanel::Params& p) -: LLPanel(p) +LLPanelProfileView::LLPanelProfileView() +: LLPanel() { } -- cgit v1.2.3