diff options
author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-17 18:52:08 +0200 |
---|---|---|
committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-17 18:52:08 +0200 |
commit | f10fc0e72caf59209d9188a5127ce45ea8c61001 (patch) | |
tree | e8c182a922681df64862953711b3cef7e639f883 | |
parent | e0855e524941e476950eb17510503284079229da (diff) | |
parent | b0b796cb05b2313b3c8c642838b68e7d9a0d84a6 (diff) |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
-rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 4f76d32ad5..70e4798079 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -194,6 +194,7 @@ void LLPanelIMControlPanel::setSessionId(const LLUUID& session_id) childSetEnabled("pay_btn", FALSE); getChild<LLTextBox>("avatar_name")->setValue(im_session->mName); + getChild<LLTextBox>("avatar_name")->setToolTip(im_session->mName); } else { @@ -217,6 +218,7 @@ void LLPanelIMControlPanel::nameUpdatedCallback(const LLUUID& id, const std::str avatar_name.append(" "); avatar_name.append(last); getChild<LLTextBox>("avatar_name")->setValue(avatar_name); + getChild<LLTextBox>("avatar_name")->setToolTip(avatar_name); } } |