summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-12-07 14:44:52 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-12-07 14:44:52 -0800
commit5400b817e8ae3cda9a55c929b135b4cc1dd91430 (patch)
tree3c707707a65cb46ba27fa2c8d4f36d1f180c357c
parent0037b1e2c75d49481aee6fffd24395a79fbf6699 (diff)
parentcd20d3dc2b02754ca14b314a9cab505535ff8e8d (diff)
merging in latest changes
-rw-r--r--indra/newview/llfloaterimsessiontab.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 8e4e4e809a..4c6d8fa5a0 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -167,7 +167,7 @@ void LLFloaterIMSessionTab::addToHost(const LLUUID& session_id)
if (!conversp->isNearbyChat()
|| gSavedSettings.getBOOL("NearbyChatIsNotTornOff"))
{
- floater_container->addFloater(conversp, !floater_container->getVisible(), LLTabContainer::END);
+ floater_container->addFloater(conversp, !floater_container->getVisible(), LLTabContainer::RIGHT_OF_CURRENT);
}
else
{