diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-08 12:27:33 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-08 12:27:33 +0000 |
| commit | 7660c19ce8fed013eea06450fe6deb4ae92f3ead (patch) | |
| tree | a6b454d6b93a1b8befc1467a4f3570f5fa89a1af /indra/newview/llchathistory.cpp | |
| parent | 62f0f426532808755f6d97f34fd2d8c9e5d2fa6a (diff) | |
| parent | 4e28c10971dc4f9a52a7b3f109143dbce3528d21 (diff) | |
Merge from viewer2 trunk.
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(); |