summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprofileview.cpp
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-11-24 15:05:13 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-11-24 15:05:13 -0800
commitfb26dd779613ea088e44fd5d85044698cf782ede (patch)
treee2908fb32ccc3c9d3b48cece2759b072aff86a62 /indra/newview/llpanelprofileview.cpp
parent07a396e3119af7dd3cd56f64e066c70f8aa1b5bd (diff)
parent9e2d78aca1fa96e96b4b324cabfb0efeb26f7397 (diff)
Merge
Diffstat (limited to 'indra/newview/llpanelprofileview.cpp')
-rw-r--r--indra/newview/llpanelprofileview.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index bcf5b16aa6..7832f63e6a 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -193,8 +193,10 @@ void LLPanelProfileView::onAvatarNameCached(const LLUUID& id, const std::string&
getChild<LLUICtrl>("user_name", FALSE)->setValue(first_name + " " + last_name);
}
-void LLPanelProfileView::togglePanel(LLPanel* panel)
+void LLPanelProfileView::togglePanel(LLPanel* panel, const LLSD& key)
{
+ // *TODO: unused method?
+
LLPanelProfile::togglePanel(panel);
if(FALSE == panel->getVisible())
{