Build fix
parent
b7b6125001
commit
30a6da68bc
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -318,10 +318,6 @@ void LLNearbyChat::setVisible(BOOL visible)
|
|||
LLIMConversation::setVisible(visible);
|
||||
}
|
||||
|
||||
void LLNearbyChat::onCallButtonClicked()
|
||||
{
|
||||
LLAgent::toggleMicrophone(NULL);
|
||||
}
|
||||
|
||||
void LLNearbyChat::enableDisableCallBtn()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -108,8 +108,6 @@ protected:
|
|||
|
||||
void displaySpeakingIndicator();
|
||||
|
||||
void onCallButtonClicked();
|
||||
|
||||
// set the enable/disable state for the Call button
|
||||
virtual void enableDisableCallBtn();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue