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

LLGroupActions too! (Strengthens RLVa restrictions!)

Browse Source 
Cleans up llfloatergroupinfo, makes it an instance tracker... pretty much as nice as llfloateravatarinfo now ^*^
Adds notifications JoinGroupNoCost and JoinedTooManyGroups (added to our existing translations, of course)
Cleans up all around, placing groupactions around.

Touches up bits for avataractions
This commit is contained in:
Lirusaito
2013-05-31 07:37:00 -04:00
parent 8d10a21a7a
commit fcd6f217d2
34 changed files with 890 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llimpanel.cpp
View File

@@ -50,6 +50,7 @@
#include "llcallingcard.h"
#include "llchat.h"
#include "llconsole.h"
#include "llgroupactions.h"
#include "llfloateractivespeakers.h"
#include "llfloaterchat.h"
#include "llfloatergroupinfo.h"
@@ -1363,7 +1364,7 @@ BOOL LLFloaterIMPanel::postBuild()
if (LLButton* btn = findChild<LLButton>("profile_tele_btn"))
btn->setCommitCallback(boost::bind(static_cast<void(*)(const LLUUID&)>(LLAvatarActions::offerTeleport), mOtherParticipantUUID));
if (LLButton* btn = findChild<LLButton>("group_info_btn"))
btn->setCommitCallback(boost::bind(&LLFloaterIMPanel::onClickGroupInfo, this));
btn->setCommitCallback(boost::bind(LLGroupActions::show, mSessionUUID));
childSetAction("history_btn", onClickHistory, this);
if (LLUICtrl* ctrl = findChild<LLUICtrl>("rp_mode"))
ctrl->setCommitCallback(boost::bind(&LLFloaterIMPanel::onRPMode, this, _2));
@@ -1374,9 +1375,6 @@ BOOL LLFloaterIMPanel::postBuild()
if (LLButton* btn = findChild<LLButton>("toggle_active_speakers_btn"))
btn->setCommitCallback(boost::bind(&LLFloaterIMPanel::onClickToggleActiveSpeakers, this, _2));
//LLButton* close_btn = getChild<LLButton>("close_btn");
//close_btn->setClickedCallback(&LLFloaterIMPanel::onClickClose, this);
mHistoryEditor = getChild<LLViewerTextEditor>("im_history");
mHistoryEditor->setParseHTML(TRUE);
mHistoryEditor->setParseHighlights(TRUE);
@@ -1899,22 +1897,6 @@ void LLFloaterIMPanel::onClickHistory( void* userdata )
}
}
void LLFloaterIMPanel::onClickGroupInfo()
{
// Bring up the Profile window
LLFloaterGroupInfo::showFromUUID(mSessionUUID);
}
// static
void LLFloaterIMPanel::onClickClose( void* userdata )
{
LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
if(self)
{
self->close();
}
}
// static
void LLFloaterIMPanel::onClickStartCall(void* userdata)
{