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

A few changes after code review from Liru

Browse Source
This commit is contained in:
Cinder
2014-07-18 16:45:14 -06:00
committed by Inusaito Sayori
parent b7e8d36cf8
commit 73d8cedf7e
6 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llmediafilter.cpp
View File

@@ -51,6 +51,11 @@ void reportToChat(const std::string& message)
LLFloaterChat::addChat(chat, FALSE, FALSE);
}
LLMediaFilter::LLMediaFilter()
{
loadMediaFilterFromDisk();
}
void LLMediaFilter::filterMediaUrl(LLParcel* parcel)
{
if (!parcel) return;
@@ -194,11 +199,6 @@ void LLMediaFilter::addToMediaList(const std::string& in_url, EMediaList list, b
saveMediaFilterToDisk();
}
void LLMediaFilter::init()
{
loadMediaFilterFromDisk();
}
void LLMediaFilter::removeFromMediaList(string_vec_t domains, EMediaList list)
{
switch (list)
@@ -364,7 +364,7 @@ bool handle_audio_filter_callback(const LLSD& notification, const LLSD& response
}
else if (command == PARCEL_MEDIA_COMMAND_TIME)
{
//LLViewerParcelMedia::seek(LLViewerParcelMedia::sMediaCommandTime);
LLViewerParcelMedia::seek(LLViewerParcelMedia::sMediaCommandTime);
}
LLMediaFilter::getInstance()->setQueuedMediaCommand(0);
}
@@ -431,7 +431,7 @@ bool handle_media_filter_callback(const LLSD& notification, const LLSD& response
}
else if (command == PARCEL_MEDIA_COMMAND_TIME)
{
//LLViewerParcelMedia::seek(LLViewerParcelMedia::sMediaCommandTime);
LLViewerParcelMedia::seek(LLViewerParcelMedia::sMediaCommandTime);
}
LLMediaFilter::getInstance()->setQueuedMediaCommand(0);
}