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

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

Browse Source
This commit is contained in:
Lirusaito
2013-06-23 02:25:15 -04:00
parent c8427e1c63 62f5e73767
commit d4bed6382c
68 changed files with 661 additions and 1039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llviewerparcelmedia.cpp
View File

@@ -809,9 +809,9 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
sDeniedMedia.erase(ip);
dirty = true;
}
if (dirty)
if (dirty && SLFloaterMediaFilter::findInstance())
{
SLFloaterMediaFilter::setDirty();
SLFloaterMediaFilter::getInstance()->setDirty();
}
}
@@ -987,7 +987,7 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
}
LLViewerParcelMedia::sMediaQueries.erase(domain);
SLFloaterMediaFilter::setDirty();
if (SLFloaterMediaFilter::findInstance()) SLFloaterMediaFilter::getInstance()->setDirty();
}
void LLViewerParcelMedia::saveDomainFilterList()
@@ -1018,7 +1018,7 @@ bool LLViewerParcelMedia::loadDomainFilterList()
llifstream medialistFile(medialist_filename);
LLSDSerialize::fromXML(sMediaFilterList, medialistFile);
medialistFile.close();
SLFloaterMediaFilter::setDirty();
if (SLFloaterMediaFilter::findInstance()) SLFloaterMediaFilter::getInstance()->setDirty();
return true;
}
else
@@ -1034,7 +1034,7 @@ void LLViewerParcelMedia::clearDomainFilterList()
sDeniedMedia.clear();
saveDomainFilterList();
LLNotificationsUtil::add("MediaFiltersCleared");
SLFloaterMediaFilter::setDirty();
if (SLFloaterMediaFilter::findInstance()) SLFloaterMediaFilter::getInstance()->setDirty();
}
std::string LLViewerParcelMedia::extractDomain(std::string url)