diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 19:36:03 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 19:36:03 -0800 |
commit | e5c9fe005e2533b10ad9eeeec9041171f15247d0 (patch) | |
tree | 43cfc17cf53709ed887506b655093f856126ae96 /indra/newview/llfloatertelehub.cpp | |
parent | 3a02b9ec882c98009ae6c24913ee8a7a620b0f87 (diff) | |
parent | 17d1d3c129c25dd27ddbf2d15ab8873a61c16658 (diff) |
Automated merge with http://demeter:8000
Diffstat (limited to 'indra/newview/llfloatertelehub.cpp')
-rw-r--r-- | indra/newview/llfloatertelehub.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llfloatertelehub.cpp b/indra/newview/llfloatertelehub.cpp index 9841cd2796..816181643f 100644 --- a/indra/newview/llfloatertelehub.cpp +++ b/indra/newview/llfloatertelehub.cpp @@ -84,17 +84,6 @@ void LLFloaterTelehub::onOpen(const LLSD& key) LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset); LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolCompTranslate::getInstance() ); - // Find tools floater, glue to bottom - if (gFloaterTools) - { - LLRect tools_rect = gFloaterTools->getRect(); - S32 our_width = getRect().getWidth(); - S32 our_height = getRect().getHeight(); - LLRect our_rect; - our_rect.setLeftTopAndSize(tools_rect.mLeft, tools_rect.mBottom, our_width, our_height); - setRect(our_rect); - } - sendTelehubInfoRequest(); mObjectSelection = LLSelectMgr::getInstance()->getEditSelection(); |