summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Serdjuk <dserduk@productengine.com>2010-02-23 19:49:44 +0200
committerDenis Serdjuk <dserduk@productengine.com>2010-02-23 19:49:44 +0200
commit83712555cf330e7ae84b31e9f54031a56c3a85e2 (patch)
tree3f7ed0e91682285ebc9e08563e2f24e133bd3fc8
parentdaa5051e51dddd51b900410bff3a89e3f7220139 (diff)
fixed Low bug EXT-5126 Not enough padding on left edge of Nearby Chat toasts
Solution: Nearby Chat toasts has been aligned with the chat input field --HG-- branch : product-engine
-rw-r--r--indra/newview/llnearbychathandler.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index 3c390c0281..a211adc79d 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -34,6 +34,7 @@
#include "llnearbychathandler.h"
+#include "llbottomtray.h"
#include "llchatitemscontainerctrl.h"
#include "llnearbychat.h"
#include "llrecentpeople.h"
@@ -319,9 +320,9 @@ LLNearbyChatHandler::~LLNearbyChatHandler()
void LLNearbyChatHandler::initChannel()
{
LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
+ LLView* chat_box = LLBottomTray::getInstance()->getChildView("chat_box");
S32 channel_right_bound = nearby_chat->getRect().mRight;
- S32 channel_width = nearby_chat->getRect().mRight;
- mChannel->init(channel_right_bound - channel_width, channel_right_bound);
+ mChannel->init(chat_box->getRect().mLeft, channel_right_bound);
}