5 files changed, 239 insertions, 42 deletions

diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index a5d97f2..b816ab4 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -649,13 +649,18 @@ bool LLViewerParcelMedia::allowedMedia(std::string media_url)
 {
         LLStringUtil::trim(media_url);
         std::string domain = extractDomain(media_url);
+        LLHost host;
+        host.setHostByName(domain);
+        std::string ip = host.getIPString();
         if (sAllowedMedia.count(domain))
         {
                 return true;
         }
+        std::string server;
         for (S32 i = 0; i < (S32)sMediaFilterList.size(); i++)
         {
-                if (sMediaFilterList[i]["domain"].asString() == domain)
+                server = sMediaFilterList[i]["domain"].asString();
+                if (server == domain || server == ip)
                 {
                         if (sMediaFilterList[i]["action"].asString() == "allow")
                         {
@@ -675,6 +680,7 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
         std::string media_action;
         std::string media_url;
         std::string domain;
+        std::string ip;
 
         if (parcel != LLViewerParcelMgr::getInstance()->getAgentParcel())
         {
@@ -703,31 +709,51 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
                 return;
         }
 
+        LLHost host;
+        host.setHostByName(domain);
+        ip = host.getIPString();
+
         if (sIsUserAction)
         {
                 // This was a user manual request to play this media, so give
                 // it another chance...
                 sIsUserAction = false;
+                bool dirty = false;
                 if (sDeniedMedia.count(domain))
                 {
                         sDeniedMedia.erase(domain);
+                        dirty = true;
+                }
+                if (sDeniedMedia.count(ip))
+                {
+                        sDeniedMedia.erase(ip);
+                        dirty = true;
+                }
+                if (dirty)
+                {
                         SLFloaterMediaFilter::setDirty();
                 }
         }
 
-        if (!sMediaFilterListLoaded || sDeniedMedia.count(domain))
+        if (media_url.empty())
+        {
+                media_action == "allow";
+        }
+        else if (!sMediaFilterListLoaded || sDeniedMedia.count(domain) || sDeniedMedia.count(ip))
         {
                 media_action = "ignore";
         }
-        else if (sAllowedMedia.count(domain))
+        else if (sAllowedMedia.count(domain) || sAllowedMedia.count(ip))
         {
                 media_action = "allow";
         }
         else
         {
+                std::string server;
                 for (S32 i = 0; i < (S32)sMediaFilterList.size(); i++)
                 {
-                        if (sMediaFilterList[i]["domain"].asString() == domain)
+                        server = sMediaFilterList[i]["domain"].asString();
+                        if (server == domain || server == ip)
                         {
                                 media_action = sMediaFilterList[i]["action"].asString();
                                 break;
@@ -735,7 +761,7 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
                 }
         }
 
-        if (media_action == "allow" || media_url.empty())
+        if (media_action == "allow")
         {
                 if (type == 0)
                 {
@@ -745,47 +771,51 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
                 {
                         playStreamingMusic(parcel, false);
                 }
+                return;
         }
-        else if (media_action == "deny")
+        if (media_action == "ignore")
         {
-                LLSD args;
-                args["DOMAIN"] = domain;
-                LLNotifications::instance().add("MediaBlocked", args);
                 if (type == 1)
                 {
                         LLViewerParcelMedia::stopStreamingMusic();
                 }
-                // So to avoid other "blocked" messages later in the session
-                // for this url should it be requested again by a script.
-                sDeniedMedia.insert(domain);
+                return;
+        }
+
+        LLSD args;
+        if (ip != domain && domain.find('/') == std::string::npos)
+        {
+                args["DOMAIN"] = domain + " (" + ip + ")";
         }
-        else if (media_action == "ignore")
+        else
+        {
+                args["DOMAIN"] = domain;
+        }
+
+        if (media_action == "deny")
         {
+                LLNotifications::instance().add("MediaBlocked", args);
                 if (type == 1)
                 {
                         LLViewerParcelMedia::stopStreamingMusic();
                 }
+                // So to avoid other "blocked" messages later in the session
+                // for this url should it be requested again by a script.
+                // We don't add the IP, on purpose (want to show different
+                // blocks for different domains pointing to the same IP).
+                sDeniedMedia.insert(domain);
         }
         else
         {
                 sMediaQueries.insert(domain);
-                LLSD args;
-                args["DOMAIN"] = domain;
-                if (media_url.find('?') != std::string::npos)
-                {
-                        args["WARNING"] = " (WARNING: this URL also contains parameter(s) that could potentially be used to correlate your avatar name with your IP)";
-                }
-                else
-                {
-                        args["WARNING"] = "";
-                }
+                args["URL"] = media_url;
                 if (type == 0)
                 {
-                        args["TYPE"] = "a media";
+                        args["TYPE"] = "media";
                 }
                 else
                 {
-                        args["TYPE"] = "an audio";
+                        args["TYPE"] = "audio";
                 }
                 LLNotifications::instance().add("MediaAlert", args, LLSD(), boost::bind(callback_media_alert, _1, _2, parcel, type, domain));
         }
@@ -795,8 +825,19 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
 {
         S32 option = LLNotification::getSelectedOption(notification, response);
 
+        LLHost host;
+        host.setHostByName(domain);
+        std::string ip = host.getIPString();
+
         LLSD args;
-        args["DOMAIN"] = domain;
+        if (ip != domain && domain.find('/') == std::string::npos)
+        {
+                args["DOMAIN"] = domain + " (" + ip + ")";
+        }
+        else
+        {
+                args["DOMAIN"] = domain;
+        }
 
         if (option == 0 || option == 3) // Allow or Whitelist
         {
@@ -807,6 +848,11 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
                         newmedia["domain"] = domain;
                         newmedia["action"] = "allow";
                         LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                        if (ip != domain && domain.find('/') == std::string::npos)
+                        {
+                                newmedia["domain"] = ip;
+                                LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                        }
                         LLViewerParcelMedia::saveDomainFilterList();
                         args["LISTED"] = "whitelisted";
                         LLNotifications::instance().add("MediaListed", args);
@@ -823,6 +869,10 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
         else if (option == 1 || option == 2) // Deny or Blacklist
         {
                 LLViewerParcelMedia::sDeniedMedia.insert(domain);
+                if (ip != domain && domain.find('/') == std::string::npos)
+                {
+                        LLViewerParcelMedia::sDeniedMedia.insert(ip);
+                }
                 if (type == 1)
                 {
                         LLViewerParcelMedia::stopStreamingMusic();
@@ -837,6 +887,11 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
                         newmedia["domain"] = domain;
                         newmedia["action"] = "deny";
                         LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                        if (ip != domain && domain.find('/') == std::string::npos)
+                        {
+                                newmedia["domain"] = ip;
+                                LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                        }
                         LLViewerParcelMedia::saveDomainFilterList();
                         args["LISTED"] = "blacklisted";
                         LLNotifications::instance().add("MediaListed", args);
@@ -975,3 +1030,4 @@ std::string LLViewerParcelMedia::extractDomain(std::string url)
 
         return url;
 }
+
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
index 9b7355c..5faaf1a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
@@ -15,47 +15,64 @@
          background_visible="true" mouse_opaque="true"
          multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
          bottom_delta="-205" left="15" height="200" width="280">
-                <column name="whitelist_col" label="Allowed domains/objects" dynamicwidth="true" />
+                <column name="whitelist_col" label="Allowed domains or server objects" dynamicwidth="true" />
         </scroll_list>
 
         <scroll_list name="blacklist_list" follows="top|bottom|right"
          background_visible="true" mouse_opaque="true"
          multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
          bottom_delta="0" right="-15" height="200" width="280">
-                <column name="blacklist_col" label="Blocked domains/objects" dynamicwidth="true" />
+                <column name="blacklist_col" label="Blocked domains or server objects" dynamicwidth="true" />
         </scroll_list>
 
         <button name="add_whitelist" font="SansSerif" label="Add..." halign="center"
+         tool_tip="Add a server to the whitelist"
          enabled="true" mouse_opaque="true" follows="bottom|left"
-         bottom_delta="-25" left="30" height="20" width="80" />
+         bottom_delta="-25" left="15" height="20" width="80" />
 
         <button name="remove_whitelist" font="SansSerif" label="Remove" halign="center"
+         tool_tip="Remove the selected server from the whitelist"
          enabled="true" mouse_opaque="true" follows="bottom|left"
-         bottom_delta="0" left_delta="100" height="20" width="80" />
+         bottom_delta="0" left="100" height="20" width="80" />
 
         <button name="clear_lists" font="SansSerif" label="Clear lists" halign="center"
-         enabled="true" mouse_opaque="true" follows="bottom|left|right"
-         bottom_delta="0" left_delta="110" height="20" width="120" />
+         tool_tip="Clear all lists"
+         enabled="true" mouse_opaque="true" follows="bottom|left"
+         bottom_delta="0" left="205" height="20" width="90" />
+
+        <button name="show_ips" font="SansSerif" label="Show IPs" halign="center"
+         tool_tip="Show the IP associated with each domain name (makes the viewer pause while the list is refreshed, because of DNS lookups)"
+         enabled="true" mouse_opaque="true" follows="bottom|right"
+         bottom_delta="0" right="-205" height="20" width="90" />
 
         <button name="add_blacklist" font="SansSerif" label="Add..." halign="center"
+         tool_tip="Add a server to the blacklist"
          enabled="true" mouse_opaque="true" follows="bottom|right"
-         bottom_delta="0" right="-130" height="20" width="80" />
+         bottom_delta="0" right="-100" height="20" width="80" />
 
         <button name="remove_blacklist" font="SansSerif" label="Remove" halign="center"
+         tool_tip="Remove the selected server from the blacklist"
          enabled="true" mouse_opaque="true" follows="bottom|right"
-         bottom_delta="0" right="-30" height="20" width="80" />
+         bottom_delta="0" right="-15" height="20" width="80" />
 
-        <text name="add_text" font="SansSerif" mouse_opaque="true" enabled="true"
-         bottom_delta="-25" left="20" height="20" width="500" follows="left|right|bottom">
+        <text name="add_text" font="SansSerif" mouse_opaque="true"
+         bottom_delta="-25" left="20" height="20" width="450" follows="left|right|bottom">
                 New domain:
         </text>
 
+        <check_box name="match_ip" label="Add/remove matching IP" initial_value="true"
+         tool_tip="Add or remove any IP associated with the added or removed domain name"
+         font="SansSerifSmall" mouse_opaque="true" radio_style="false"
+         bottom_delta="2" right="-95" height="16" width="70" follows="right|bottom" />
+
         <line_editor name="input_domain" max_length="255" font="SansSerif" enabled="false"
+         tool_tip="Enter the new URL, domain name, IP or scripted object HTTP server path here"
          select_all_on_focus_received="true" select_on_focus="true"
          bevel_style="in" border_style="line" border_thickness="1"
-         bottom_delta="-20"     right="-100" height="20" left="15" follows="left|bottom|right"/>
+         bottom_delta="-22"     right="-100" height="20" left="15" follows="left|bottom|right"/>
 
         <button name="commit_domain" font="SansSerif" label="Add" halign="center" enabled="false"
+         tool_tip="Add to the list"
          mouse_opaque="true" follows="bottom|right"
          bottom_delta="0" right="-15" height="20" width="80"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 27f5529..aa4a1b5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7324,11 +7324,15 @@ The Second Life Terms of Service do not allow you to opt out. By logging in to S
    icon="alert.tga"
    name="MediaAlert"
    type="alert">
-The owner of this parcel has requested [TYPE] URL pertaining to the following domain or scripted object to be loaded by your viewer[WARNING]:
+The owner of this parcel has requested the following [TYPE] URL to be loaded by your viewer:
+
+[URL]
+
+You may choose to allow or deny the corresponding domain or in-world scripted object server:
 
 [DOMAIN]
 
-"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever to the above domain or scripted object.
+"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever.
    <form name="form">
     <button
          index="0"
diff --git a/linden/indra/newview/slfloatermediafilter.cpp b/linden/indra/newview/slfloatermediafilter.cpp
index c47ed26..7b287e0 100644
--- a/linden/indra/newview/slfloatermediafilter.cpp
+++ b/linden/indra/newview/slfloatermediafilter.cpp
@@ -43,6 +43,7 @@
 
 SLFloaterMediaFilter* SLFloaterMediaFilter::sInstance = NULL;
 bool SLFloaterMediaFilter::sIsWhitelist = false;
+bool SLFloaterMediaFilter::sShowIPs = false;
 
 SLFloaterMediaFilter::SLFloaterMediaFilter() : LLFloater(std::string("media filter")), mIsDirty(false)
 {
@@ -62,6 +63,7 @@ BOOL SLFloaterMediaFilter::postBuild()
         if (mWhitelistSLC && mBlacklistSLC)
         {
                 childSetAction("clear_lists", onClearLists, this);
+                childSetAction("show_ips", onShowIPs, this);
                 childSetAction("add_whitelist", onWhitelistAdd, this);
                 childSetAction("remove_whitelist", onWhitelistRemove, this);
                 childSetAction("add_blacklist", onBlacklistAdd, this);
@@ -84,6 +86,8 @@ void SLFloaterMediaFilter::draw()
                 mWhitelistSLC->deleteAllItems();
                 mBlacklistSLC->deleteAllItems();
                 std::set<std::string> listed;
+                LLHost host;
+                std::string ip;
                 std::string domain;
                 std::string action;
                 LLSD element;
@@ -92,6 +96,16 @@ void SLFloaterMediaFilter::draw()
                 for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
                 {
                         domain = LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString();
+                        if (sShowIPs)
+                        {
+                                host.setHostByName(domain);
+                                ip = host.getIPString();
+                                if (ip != domain && domain.find('/') == std::string::npos)
+                                {
+                                        domain += " (" + ip + ")";
+                                }
+                        }
+
                         action = LLViewerParcelMedia::sMediaFilterList[i]["action"].asString();
                         if (!domain.empty() && action == "allow")
                         {       
@@ -123,6 +137,15 @@ void SLFloaterMediaFilter::draw()
                 for (it = LLViewerParcelMedia::sAllowedMedia.begin(); it != LLViewerParcelMedia::sAllowedMedia.end(); it++)
                 {
                         domain = *it;
+                        if (sShowIPs)
+                        {
+                                host.setHostByName(domain);
+                                ip = host.getIPString();
+                                if (ip != domain && domain.find('/') == std::string::npos)
+                                {
+                                        domain += " (" + ip + ")";
+                                }
+                        }
                         if (listed.count(domain) == 0)
                         {
                                 element["columns"][0]["value"] = domain;
@@ -133,6 +156,15 @@ void SLFloaterMediaFilter::draw()
                 for (it = LLViewerParcelMedia::sDeniedMedia.begin(); it != LLViewerParcelMedia::sDeniedMedia.end(); it++)
                 {
                         domain = *it;
+                        if (sShowIPs)
+                        {
+                                host.setHostByName(domain);
+                                ip = host.getIPString();
+                                if (ip != domain && domain.find('/') == std::string::npos)
+                                {
+                                        domain += " (" + ip + ")";
+                                }
+                        }
                         if (listed.count(domain) == 0)
                         {
                                 element["columns"][0]["value"] = domain;
@@ -145,18 +177,21 @@ void SLFloaterMediaFilter::draw()
                 if (!gSavedSettings.getBOOL("MediaEnableFilter"))
                 {
                         childDisable("clear_lists");
+                        childDisable("show_ips");
                         childDisable("blacklist_list");
                         childDisable("whitelist_list");
                         childDisable("remove_whitelist");
                         childDisable("add_whitelist");
                         childDisable("remove_blacklist");
                         childDisable("add_blacklist");
+                        childDisable("match_ip");
                         childDisable("input_domain");
                         childDisable("commit_domain");
                         childSetText("add_text", std::string("****** WARNING: media filtering is currently DISABLED ******"));
                 }
 
                 mIsDirty = false;
+                sShowIPs = false;
         }
 
         LLFloater::draw();
@@ -208,6 +243,12 @@ void SLFloaterMediaFilter::onClearLists(void* data)
         LLViewerParcelMedia::clearDomainFilterList();
 }
 
+void SLFloaterMediaFilter::onShowIPs(void* data)
+{
+        sShowIPs = true;
+        setDirty();
+}
+
 void SLFloaterMediaFilter::onWhitelistAdd(void* data)
 {
     if (!sInstance)
@@ -215,6 +256,7 @@ void SLFloaterMediaFilter::onWhitelistAdd(void* data)
                 return;
         }
         sInstance->childDisable("clear_lists");
+        sInstance->childDisable("show_ips");
         sInstance->childDisable("blacklist_list");
         sInstance->childDisable("whitelist_list");
         sInstance->childDisable("remove_whitelist");
@@ -238,6 +280,12 @@ void SLFloaterMediaFilter::onWhitelistRemove(void* data)
         if (selected)
         {
                 std::string domain = sInstance->mWhitelistSLC->getSelectedItemLabel();
+                size_t pos = domain.find(' ');
+                if (pos != std::string::npos)
+                {
+                        domain = domain.substr(0, pos);
+                }
+
                 LLViewerParcelMedia::sAllowedMedia.erase(domain);
 
                 for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
@@ -245,11 +293,32 @@ void SLFloaterMediaFilter::onWhitelistRemove(void* data)
                         if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
                         {
                                 LLViewerParcelMedia::sMediaFilterList.erase(i);
-                                LLViewerParcelMedia::saveDomainFilterList();
                                 break;
                         }
                 }
 
+                if (sInstance->childGetValue("match_ip") && domain.find('/') == std::string::npos)
+                {
+                        LLHost host;
+                        host.setHostByName(domain);
+                        std::string ip = host.getIPString();
+
+                        if (ip != domain)
+                        {
+                                LLViewerParcelMedia::sAllowedMedia.erase(ip);
+
+                                for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+                                {
+                                        if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == ip)
+                                        {
+                                                LLViewerParcelMedia::sMediaFilterList.erase(i);
+                                                break;
+                                        }
+                                }
+                        }
+                }
+
+                LLViewerParcelMedia::saveDomainFilterList();
                 setDirty();
         }
 }
@@ -261,6 +330,7 @@ void SLFloaterMediaFilter::onBlacklistAdd(void* data)
                 return;
         }
         sInstance->childDisable("clear_lists");
+        sInstance->childDisable("show_ips");
         sInstance->childDisable("blacklist_list");
         sInstance->childDisable("whitelist_list");
         sInstance->childDisable("remove_whitelist");
@@ -284,6 +354,12 @@ void SLFloaterMediaFilter::onBlacklistRemove(void* data)
         if (selected)
         {
                 std::string domain = sInstance->mBlacklistSLC->getSelectedItemLabel();
+                size_t pos = domain.find(' ');
+                if (pos != std::string::npos)
+                {
+                        domain = domain.substr(0, pos);
+                }
+
                 LLViewerParcelMedia::sDeniedMedia.erase(domain);
 
                 for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
@@ -291,11 +367,32 @@ void SLFloaterMediaFilter::onBlacklistRemove(void* data)
                         if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
                         {
                                 LLViewerParcelMedia::sMediaFilterList.erase(i);
-                                LLViewerParcelMedia::saveDomainFilterList();
                                 break;
                         }
                 }
 
+                if (sInstance->childGetValue("match_ip") && domain.find('/') == std::string::npos)
+                {
+                        LLHost host;
+                        host.setHostByName(domain);
+                        std::string ip = host.getIPString();
+
+                        if (ip != domain)
+                        {
+                                LLViewerParcelMedia::sDeniedMedia.erase(ip);
+
+                                for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+                                {
+                                        if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == ip)
+                                        {
+                                                LLViewerParcelMedia::sMediaFilterList.erase(i);
+                                                break;
+                                        }
+                                }
+                        }
+                }
+
+                LLViewerParcelMedia::saveDomainFilterList();
                 setDirty();
         }
 }       
@@ -308,6 +405,10 @@ void SLFloaterMediaFilter::onCommitDomain(void* data)
         }
         std::string domain = sInstance->childGetText("input_domain");
         domain = LLViewerParcelMedia::extractDomain(domain);
+        LLHost host;
+        host.setHostByName(domain);
+        std::string ip = host.getIPString();
+        bool match_ip = (sInstance->childGetValue("match_ip") && ip != domain && domain.find('/') == std::string::npos);
 
         if (!domain.empty())
         {
@@ -318,7 +419,18 @@ void SLFloaterMediaFilter::onCommitDomain(void* data)
                         if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
                         {
                                 LLViewerParcelMedia::sMediaFilterList.erase(i);
-                                break;
+                        }
+                }
+                if (match_ip)
+                {
+                        LLViewerParcelMedia::sDeniedMedia.erase(ip);
+                        LLViewerParcelMedia::sAllowedMedia.erase(ip);
+                        for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+                        {
+                                if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == ip)
+                                {
+                                        LLViewerParcelMedia::sMediaFilterList.erase(i);
+                                }
                         }
                 }
                 LLSD newmedia;
@@ -332,10 +444,16 @@ void SLFloaterMediaFilter::onCommitDomain(void* data)
                         newmedia["action"] = "deny";
                 }
                 LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                if (match_ip)
+                {
+                        newmedia["domain"] = ip;
+                        LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                }
                 LLViewerParcelMedia::saveDomainFilterList();
         }
 
         sInstance->childEnable("clear_lists");
+        sInstance->childEnable("show_ips");
         sInstance->childEnable("blacklist_list");
         sInstance->childEnable("whitelist_list");
         sInstance->childEnable("remove_whitelist");
diff --git a/linden/indra/newview/slfloatermediafilter.h b/linden/indra/newview/slfloatermediafilter.h
index 0f900be..aafa5a2 100644
--- a/linden/indra/newview/slfloatermediafilter.h
+++ b/linden/indra/newview/slfloatermediafilter.h
@@ -52,6 +52,7 @@ public:
         static void toggleInstance();
 
         static void onClearLists(void*);
+        static void onShowIPs(void*);
         static void onWhitelistAdd(void*);
         static void onWhitelistRemove(void*);
         static void onBlacklistAdd(void*);
@@ -60,6 +61,7 @@ public:
 
 private:
         static bool sIsWhitelist;
+        static bool sShowIPs;
         LLScrollListCtrl* mWhitelistSLC;
         LLScrollListCtrl* mBlacklistSLC;
         bool mIsDirty;