summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authormberezhnoy <mberezhnoy@productengine.com>2013-04-01 08:53:44 +0300
committermberezhnoy <mberezhnoy@productengine.com>2013-04-01 08:53:44 +0300
commit255159c50f02d37fc40d45107002f5bfe27753ea (patch)
tree06eec8a6c537244b5d66d4321dc41f30a7abe51a /indra/newview
parentd29a2e2977090e0e4cf4c392d64757a10fca91a9 (diff)
CHUI-886 (Time in front of the name is not displayed when the Conversations size is reduced to a minimum.)
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llchathistory.cpp11
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());