livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergining in latest changes

master
Gilbert Gonzales 2012-12-12 10:40:47 -08:00
parent b4e738e503 3d7aaaada8
commit e7a912816e
5 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfloaterimcontainer.cpp
View File

@ -88,6 +88,11 @@ LLFloaterIMContainer::~LLFloaterIMContainer()
mNewMessageConnection.disconnect();
LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::IM, this);
if (mMicroChangedSignal.connected())
{
mMicroChangedSignal.disconnect();
}
gSavedPerAccountSettings.setBOOL("ConversationsListPaneCollapsed", mConversationsPane->isCollapsed());
gSavedPerAccountSettings.setBOOL("ConversationsMessagePaneCollapsed", mMessagesPane->isCollapsed());
@ -213,7 +218,7 @@ BOOL LLFloaterIMContainer::postBuild()
collapseMessagesPane(gSavedPerAccountSettings.getBOOL("ConversationsMessagePaneCollapsed"));
collapseConversationsPane(gSavedPerAccountSettings.getBOOL("ConversationsListPaneCollapsed"));
LLAvatarNameCache::addUseDisplayNamesCallback(boost::bind(&LLFloaterIMSessionTab::processChatHistoryStyleUpdate));
mMicroChangedSignal = LLVoiceClient::getInstance()->MicroChangedCallback(boost::bind(&LLFloaterIMContainer::updateSpeakBtnState, this));
if (! mMessagesPane->isCollapsed())
{
S32 list_width = gSavedPerAccountSettings.getS32("ConversationsListPaneWidth");

1
indra/newview/llfloaterimcontainer.h
View File

@ -176,6 +176,7 @@ public:
void updateSpeakBtnState();
static bool isConversationLoggingAllowed();
void flashConversationItemWidget(const LLUUID& session_id, bool is_flashes);
boost::signals2::connection mMicroChangedSignal;
private:
LLConversationViewSession* createConversationItemWidget(LLConversationItem* item);

1
indra/newview/llfloaterimsessiontab.cpp
View File

@ -693,7 +693,6 @@ void LLFloaterIMSessionTab::updateCallBtnState(bool callIsActive)
voiceButton->setToolTip(
callIsActive? getString("end_call_button_tooltip") : getString("start_call_button_tooltip"));
LLFloaterIMContainer::getInstance()->updateSpeakBtnState();
enableDisableCallBtn();
}

1
indra/newview/llvoiceclient.cpp
View File

@ -551,6 +551,7 @@ void LLVoiceClient::setUserPTTState(bool ptt)
{
mUserPTTState = ptt;
updateMicMuteLogic();
mMicroChangedSignal();
}
bool LLVoiceClient::getUserPTTState()

6
indra/newview/llvoiceclient.h
View File

@ -303,6 +303,9 @@ public:
LLVoiceClient();
~LLVoiceClient();
typedef boost::signals2::signal<void(void)> micro_changed_signal_t;
micro_changed_signal_t mMicroChangedSignal;
void init(LLPumpIO *pump); // Call this once at application startup (creates connector)
void terminate(); // Call this to clean up during shutdown
@ -401,6 +404,8 @@ public:
void keyUp(KEY key, MASK mask);
void middleMouseState(bool down);
boost::signals2::connection MicroChangedCallback(const micro_changed_signal_t::slot_type& cb ) { return mMicroChangedSignal.connect(cb); }
/////////////////////////////
// Accessors for data related to nearby speakers
@ -456,6 +461,7 @@ protected:
LLVoiceModuleInterface* mVoiceModule;
LLPumpIO *m_servicePump;
LLCachedControl<bool> mVoiceEffectEnabled;
LLCachedControl<std::string> mVoiceEffectDefault;