Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[LLIMMgr/LLIMPanel] Switched from dialog checks for nothing special to generic P2P session checking

Browse Source
This commit is contained in:
Inusaito Sayori
2013-11-28 20:08:57 -05:00
parent 63a9555d17
commit 909ce355e2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llimpanel.cpp
View File

@@ -506,7 +506,7 @@ BOOL LLFloaterIMPanel::postBuild()
mSpeakerPanel->refreshSpeakers();
}
if (mDialog == IM_NOTHING_SPECIAL)
if (mSessionType == P2P_SESSION)
{
getChild<LLUICtrl>("mute_btn")->setCommitCallback(boost::bind(&LLFloaterIMPanel::onClickMuteVoice, this));
getChild<LLUICtrl>("speaker_volume")->setCommitCallback(boost::bind(&LLVoiceClient::setUserVolume, LLVoiceClient::getInstance(), mOtherParticipantUUID, _2));
@@ -1145,7 +1145,7 @@ bool convert_roleplay_text(std::string& text); // Returns true if text is an act
void LLFloaterIMPanel::onSendMsg()
{
if (!gAgent.isGodlike()
&& (mDialog == IM_NOTHING_SPECIAL)
&& (mSessionType == P2P_SESSION)
&& mOtherParticipantUUID.isNull())
{
llinfos << "Cannot send IM to everyone unless you're a god." << llendl;
@@ -1258,7 +1258,7 @@ void LLFloaterIMPanel::onSendMsg()
}
// local echo
if((mDialog == IM_NOTHING_SPECIAL) &&
if((mSessionType == P2P_SESSION) &&
(mOtherParticipantUUID.notNull()))
{
std::string name;
@@ -1390,7 +1390,7 @@ void LLFloaterIMPanel::sendTypingState(bool typing)
return;
// Don't want to send typing indicators to multiple people, potentially too
// much network traffic. Only send in person-to-person IMs.
if (mDialog != IM_NOTHING_SPECIAL) return;
if (mSessionType == P2P_SESSION) return;
std::string name;
gAgent.buildFullname(name);