diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 13:53:25 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 13:53:25 -0700 |
commit | 7f2e4c621ca297af47c67f31ccdf3bddbaae57b7 (patch) | |
tree | ed00134d5718d0c734809e2da9266361ced06250 /indra/newview/llchathistory.cpp | |
parent | da1a39c935d8ef660c35d01bf9d7c53af3adf7ae (diff) | |
parent | 31220ceffbacdf0f14929b735b0c9e250e1225ca (diff) |
Merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r-- | indra/newview/llchathistory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 5bf3d7b913..6d98afbc58 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -330,8 +330,8 @@ public: LLTextBox* user_name = getChild<LLTextBox>("user_name"); user_name->setValue( LLSD(av_name.mDisplayName ) ); - user_name->setToolTip( av_name.mSLID ); - setToolTip( av_name.mSLID ); + user_name->setToolTip( av_name.mUsername ); + setToolTip( av_name.mUsername ); } protected: |