diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-01 16:36:58 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-01 16:36:58 +0300 |
| commit | 30a6da68bcee5b871fd0a18dab703fe20271d83c (patch) | |
| tree | 6c0b48350862f173ab398b4e582795c51eaed0e5 | |
| parent | b7b612500132acf05e82f1482460ffa9312fcc4a (diff) | |
Build fix
| -rw-r--r-- | indra/newview/llimconversation.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llnearbychat.h | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index 893d8dc83f..d8c7c63e9e 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -37,7 +37,7 @@ #include "llnearbychat.h" #include "llnearbychat.h" -const F32 REFRESH_INTERVAL = 0.2; +const F32 REFRESH_INTERVAL = 0.2f; LLIMConversation::LLIMConversation(const LLUUID& session_id) : LLTransientDockableFloater(NULL, true, session_id) @@ -127,7 +127,7 @@ void LLIMConversation::buildParticipantList() } else { - // for group and Ad-hoc chat we need to include agent into list + // for group and ad-hoc chat we need to include agent into list if(!mIsP2PChat && !mParticipantList && mSessionID.notNull()) { LLSpeakerMgr* speaker_manager = LLIMModel::getInstance()->getSpeakerManager(mSessionID); diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 4ac72858d3..8b54c6ce53 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -318,10 +318,6 @@ void LLNearbyChat::setVisible(BOOL visible) LLIMConversation::setVisible(visible); } -void LLNearbyChat::onCallButtonClicked() -{ - LLAgent::toggleMicrophone(NULL); -} void LLNearbyChat::enableDisableCallBtn() { diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h index b38111defa..bc0e54de15 100644 --- a/indra/newview/llnearbychat.h +++ b/indra/newview/llnearbychat.h @@ -108,8 +108,6 @@ protected: void displaySpeakingIndicator(); - void onCallButtonClicked(); - // set the enable/disable state for the Call button virtual void enableDisableCallBtn(); |