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

Only update media filter floater if it's actually open and only sort lists after adding all elements

meow-7.2.2
Ansariel 2016-06-20 12:09:24 +02:00
parent 55908c316d
commit 0657c42b9c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/floatermedialists.cpp
View File

@ -57,17 +57,18 @@ BOOL FloaterMediaLists::postBuild()
element["columns"][0]["column"] = "list";
element["columns"][0]["value"] = itr["domain"].asString();
if (itr["action"].asString() == "allow")
{
{
mWhitelistSLC->addElement(element);
mWhitelistSLC->sortByColumn("list", TRUE);
}
else if (itr["action"].asString() == "deny")
{
mBlacklistSLC->addElement(element);
mBlacklistSLC->sortByColumn("list", TRUE);
}
}
mWhitelistSLC->sortByColumn("list", TRUE);
mBlacklistSLC->sortByColumn("list", TRUE);
return TRUE;
}
@ -87,7 +88,7 @@ void FloaterMediaLists::onWhitelistRemove()
{
std::string domain = mWhitelistSLC->getSelectedItemLabel();
for(S32 i = 0;i<(S32)LLViewerParcelMedia::sMediaFilterList.size();i++)
for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); ++i)
{
if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
{
@ -121,7 +122,7 @@ void FloaterMediaLists::onBlacklistRemove()
{
std::string domain = mBlacklistSLC->getSelectedItemLabel();
for(S32 i = 0;i<(S32)LLViewerParcelMedia::sMediaFilterList.size();i++)
for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); ++i)
{
if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
{
@ -160,7 +161,7 @@ bool FloaterMediaLists::handleAddDomainCallback(const LLSD& notification, const
LLViewerParcelMedia::sMediaFilterList.append(newmedia);
LLViewerParcelMedia::saveDomainFilterList();
LLFloater* floater = LLFloaterReg::getInstance("media_lists");
LLFloater* floater = LLFloaterReg::findInstance("media_lists");
if (floater)
{
LLScrollListCtrl* list = floater->getChild<LLScrollListCtrl>(whitelist ? "whitelist" : "blacklist");

2
indra/newview/floatermedialists.h
View File

@ -36,7 +36,7 @@ class LLButton;
class FloaterMediaLists : public LLFloater
{
public:
FloaterMediaLists(const LLSD& key);
FloaterMediaLists(const LLSD& key);
BOOL postBuild();
static bool handleAddDomainCallback(const LLSD& notification, const LLSD& response);