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

Optionally, have IM buttons on the same line as the person's name.

Browse Source 
Adds UseConciseIMButtons.
Adds floater_instant_message_concisebuttons.xml
Adds Have buttons on the same line as name for IMs (Affects new IMs) checkbox to Adv. Chat's Chat UI tab.
This commit is contained in:
Lirusaito
2013-01-09 10:19:41 -05:00
parent c96b840c53
commit a7d1a4611f
5 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llimpanel.cpp
View File

@@ -1184,7 +1184,8 @@ void LLFloaterIMPanel::init(const std::string& session_label)
// [Ansariel: Display name support]
mProfileButtonEnabled = FALSE;
// [/Ansariel: Display name support]
static LLCachedControl<bool> concisebuttons("UseConciseIMButtons");
std::string xml_filename;
switch(mDialog)
{
@@ -1206,7 +1207,7 @@ void LLFloaterIMPanel::init(const std::string& session_label)
mVoiceChannel = new LLVoiceChannelGroup(mSessionUUID, mSessionLabel);
break;
case IM_SESSION_P2P_INVITE:
xml_filename = "floater_instant_message.xml";
xml_filename = concisebuttons ? "floater_instant_message_concisebuttons.xml" : "floater_instant_message.xml";
mVoiceChannel = new LLVoiceChannelP2P(mSessionUUID, mSessionLabel, mOtherParticipantUUID);
break;
case IM_SESSION_CONFERENCE_START:
@@ -1217,7 +1218,7 @@ void LLFloaterIMPanel::init(const std::string& session_label)
// just received text from another user
case IM_NOTHING_SPECIAL:
xml_filename = "floater_instant_message.xml";
xml_filename = concisebuttons ? "floater_instant_message_concisebuttons.xml" : "floater_instant_message.xml";
mTextIMPossible = LLVoiceClient::getInstance()->isSessionTextIMPossible(mSessionUUID);
mProfileButtonEnabled = LLVoiceClient::getInstance()->isParticipantAvatar(mSessionUUID);
@@ -1227,7 +1228,7 @@ void LLFloaterIMPanel::init(const std::string& session_label)
break;
default:
llwarns << "Unknown session type" << llendl;
xml_filename = "floater_instant_message.xml";
xml_filename = concisebuttons ? "floater_instant_message_concisebuttons.xml" : "floater_instant_message.xml";
break;
}