diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-02-02 14:53:01 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-02-02 14:53:01 -0800 |
| commit | d14ecbace5c2d041fe4717c7d346083535267e24 (patch) | |
| tree | ae95d038763d50cd5fc2f962f144c028059b6c4f /indra/newview/lltoolbar.cpp | |
| parent | 58f813a136a5a889e01b39e96714af91402321ba (diff) | |
| parent | 2c0418dfe0a3e903210516a70fd947870c340bf8 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltoolbar.cpp')
| -rw-r--r-- | indra/newview/lltoolbar.cpp | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp index bf6d715c31..edbaa0d45a 100644 --- a/indra/newview/lltoolbar.cpp +++ b/indra/newview/lltoolbar.cpp @@ -60,7 +60,7 @@ #include "lltoolmgr.h" #include "llui.h" #include "llviewermenu.h" -#include "llfirstuse.h" +//#include "llfirstuse.h" #include "llpanelblockedlist.h" #include "llscrolllistctrl.h" #include "llscrolllistitem.h" @@ -70,7 +70,6 @@ #include "llviewerwindow.h" #include "lltoolgrab.h" #include "llcombobox.h" -#include "llfloaterchat.h" #include "llimpanel.h" #include "lllayoutstack.h" @@ -281,21 +280,6 @@ void LLToolBar::updateCommunicateList() } itemp = communicate_button->addElement(contact_sd, ADD_TOP); - LLSD communicate_sd; - communicate_sd["value"] = "local chat"; - communicate_sd["columns"][0]["value"] = LLFloaterChat::getInstance()->getShortTitle(); - - if (LLFloaterChat::getInstance() == frontmost_floater) - { - communicate_sd["columns"][0]["font"]["name"] = "SANSSERIF_SMALL"; - communicate_sd["columns"][0]["font"]["style"] = "BOLD"; - if (selected.isUndefined()) - { - selected = "local chat"; - } - } - itemp = communicate_button->addElement(communicate_sd, ADD_TOP); - communicate_button->addSeparator(ADD_TOP); communicate_button->add(getString("Redock Windows"), LLSD("redock"), ADD_TOP); communicate_button->addSeparator(ADD_TOP); @@ -357,8 +341,7 @@ void LLToolBar::onClickCommunicate(LLUICtrl* ctrl, const LLSD& user_data) if(chatterbox_instance) { chatterbox_instance->addFloater(LLFloaterMyFriends::getInstance(), FALSE); - chatterbox_instance->addFloater(LLFloaterChat::getInstance(), FALSE); - + LLUUID session_to_show; std::set<LLHandle<LLFloater> >::const_iterator floater_handle_it; |