diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-04-03 11:28:00 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-04-03 11:28:00 -0400 |
| commit | 7c37af37d4459425b3ab705156eeff316531bc81 (patch) | |
| tree | ac6f0d7cfb0d4798b54de04b46fa28390c63fb20 /indra/newview/llchathistory.cpp | |
| parent | 323a2f2235a52383bcfbae79bdce9e61ca808d2a (diff) | |
| parent | 0b5695fec1bc31b10c72e2e0b6936444eee89855 (diff) | |
merge
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 53926c1fef..0f138873ac 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -408,16 +408,7 @@ public: S32 user_name_width = user_name_rect.getWidth(); S32 time_box_width = time_box->getRect().getWidth(); - if (time_box->getVisible() && user_name_width <= mMinUserNameWidth) - { - time_box->setVisible(FALSE); - - user_name_rect.mRight += time_box_width; - user_name->reshape(user_name_rect.getWidth(), user_name_rect.getHeight()); - user_name->setRect(user_name_rect); - } - - if (!time_box->getVisible() && user_name_width > mMinUserNameWidth + time_box_width) + if (!time_box->getVisible() && user_name_width > mMinUserNameWidth) { user_name_rect.mRight -= time_box_width; user_name->reshape(user_name_rect.getWidth(), user_name_rect.getHeight()); |