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

Hi.

Browse Source
This commit is contained in:
Cinder
2014-07-19 20:13:59 -06:00
committed by Inusaito Sayori
parent 8cb694af89
commit 402cd21f87
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloatermediafilter.cpp
View File

@@ -66,7 +66,7 @@ BOOL LLFloaterMediaFilter::postBuild()
void LLFloaterMediaFilter::updateLists(LLMediaFilter::EMediaList list)
{
if (list == LLMediaFilter::WHITELIST && mWhitelist)
if (list == LLMediaFilter::WHITELIST)
{
LLMediaFilter::string_list_t list = LLMediaFilter::getInstance()->getWhiteList();
mWhitelist->clearRows();
@@ -78,7 +78,7 @@ void LLFloaterMediaFilter::updateLists(LLMediaFilter::EMediaList list)
mWhitelist->addElement(element);
}
}
if (list == LLMediaFilter::BLACKLIST && mBlacklist)
if (list == LLMediaFilter::BLACKLIST)
{
LLMediaFilter::string_list_t list = LLMediaFilter::getInstance()->getBlackList();
mBlacklist->clearRows();

2
indra/newview/llstartup.cpp
View File

@@ -1724,7 +1724,7 @@ bool idle_startup()
if (STATE_MULTIMEDIA_INIT == LLStartUp::getStartupState())
{
LLStartUp::multimediaInit();
LLMediaFilter::instance();
LLMediaFilter::getInstance();
LLStartUp::setStartupState( STATE_FONT_INIT );
display_startup();
return FALSE;