livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clear open merge issue in FSFloaterVoiceControls

master
Ansariel 2016-04-02 04:25:41 +02:00
parent f6d9ddd905
commit 3afead682e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/fsfloatervoicecontrols.cpp
View File

@ -47,6 +47,7 @@
#include "lltextutil.h"
#include "lltransientfloatermgr.h"
#include "llviewercontrol.h"
#include "llviewerdisplayname.h"
#include "llviewerwindow.h"
#include "llvoicechannel.h"
#include "llviewerparcelmgr.h"
@ -122,9 +123,7 @@ FSFloaterVoiceControls::FSFloaterVoiceControls(const LLSD& key)
// update the agent's name if display name setting change
LLAvatarNameCache::addUseDisplayNamesCallback(boost::bind(&FSFloaterVoiceControls::updateAgentModeratorState, this));
//<FS:ND> MERGE_TODO Needs an implementation post coroutine merge.
// LLViewerDisplayName::addNameChangedCallback(boost::bind(&FSFloaterVoiceControls::updateAgentModeratorState, this));
LLViewerDisplayName::addNameChangedCallback(boost::bind(&FSFloaterVoiceControls::updateAgentModeratorState, this));
}
FSFloaterVoiceControls::~FSFloaterVoiceControls()