diff options
| author | Jacek Antonelli | 2009-10-11 14:25:36 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-10-11 14:25:36 -0500 |
| commit | 030f4ef981978bd2345be9fef617ecb2cc172dff (patch) | |
| tree | 5c9d7d59f64e6190f021281799a8f52b7f31fdae /linden/indra/newview/llfloaterchatterbox.cpp | |
| parent | Imprudence 1.2.0 beta 2 released. (diff) | |
| parent | Force minimize button focus to the top of Mini-Map (diff) | |
| download | meta-impy-030f4ef981978bd2345be9fef617ecb2cc172dff.zip meta-impy-030f4ef981978bd2345be9fef617ecb2cc172dff.tar.gz meta-impy-030f4ef981978bd2345be9fef617ecb2cc172dff.tar.bz2 meta-impy-030f4ef981978bd2345be9fef617ecb2cc172dff.tar.xz | |
Merge remote branch 'mccabe/next' into next
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llfloaterchatterbox.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterchatterbox.cpp b/linden/indra/newview/llfloaterchatterbox.cpp index 5ef5a30..e18cca0 100644 --- a/linden/indra/newview/llfloaterchatterbox.cpp +++ b/linden/indra/newview/llfloaterchatterbox.cpp | |||
| @@ -97,7 +97,16 @@ LLFloaterChatterBox::LLFloaterChatterBox(const LLSD& seed) : | |||
| 97 | { | 97 | { |
| 98 | mAutoResize = FALSE; | 98 | mAutoResize = FALSE; |
| 99 | 99 | ||
| 100 | LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chatterbox.xml", NULL, FALSE); | 100 | // check if vertical tabs is selected |
| 101 | if (gSavedSettings.getBOOL("VerticalIMTabs")) | ||
| 102 | { | ||
| 103 | LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chatterbox_vertical.xml", NULL, FALSE); | ||
| 104 | } | ||
| 105 | else | ||
| 106 | { | ||
| 107 | LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chatterbox.xml", NULL, FALSE); | ||
| 108 | } | ||
| 109 | |||
| 101 | if (gSavedSettings.getBOOL("ContactsTornOff")) | 110 | if (gSavedSettings.getBOOL("ContactsTornOff")) |
| 102 | { | 111 | { |
| 103 | LLFloaterMyFriends* floater_contacts = LLFloaterMyFriends::getInstance(0); | 112 | LLFloaterMyFriends* floater_contacts = LLFloaterMyFriends::getInstance(0); |