summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-11-28 21:02:55 -0800
committerJames Cook <james@lindenlab.com>2009-11-28 21:02:55 -0800
commite8b436591ad198a5aa37d51077e2d5b0d5b62562 (patch)
tree196a32ac8cc9b67809201e0d762eee4b47a8cb9e /indra/newview/llchathistory.cpp
parent0e34bc413aa562acf97b77333fb9a1f0ec9b55f0 (diff)
parent9d52d15db8b61ff3172fadb1b82cd39f892251c5 (diff)
merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r--indra/newview/llchathistory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 2c9b38b82a..d08be335c3 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -284,7 +284,7 @@ private:
time_box->translate(delta_pos_x, delta_pos_y);
//... & change width of the name control
- LLTextBox* user_name = getChild<LLTextBox>("user_name");
+ LLUICtrl* user_name = getChild<LLUICtrl>("user_name");
const LLRect& user_rect = user_name->getRect();
user_name->reshape(user_rect.getWidth() + delta_pos_x, user_rect.getHeight());
}