diff options
| author | richard <none@none> | 2010-02-05 13:20:13 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-02-05 13:20:13 -0800 |
| commit | 9c1198d57d85918d02daf058b3feebe37a5760a8 (patch) | |
| tree | 7eac3a8acf6de4c05d244a7a90d53e2327c4753b /indra/newview/llchathistory.cpp | |
| parent | 4c4925e8afaff67a132ed2b43f916792e7fbb4a8 (diff) | |
| parent | df3da77fa9a067b96400eaaa5fbb05ec7e8c1d64 (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 f046e08827..3aea70d1b4 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -262,7 +262,7 @@ public: mSourceType = CHAT_SOURCE_SYSTEM; } - LLTextEditor* userName = getChild<LLTextEditor>("user_name"); + LLTextBox* userName = getChild<LLTextBox>("user_name"); userName->setReadOnlyColor(style_params.readonly_color()); userName->setColor(style_params.color()); @@ -300,7 +300,7 @@ public: /*virtual*/ void draw() { - LLTextEditor* user_name = getChild<LLTextEditor>("user_name"); + LLTextBox* user_name = getChild<LLTextBox>("user_name"); LLTextBox* time_box = getChild<LLTextBox>("time_box"); LLRect user_name_rect = user_name->getRect(); |