aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r--linden/indra/newview/llviewermenu.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index cf3cec1..a22f704 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -234,6 +234,7 @@
234#include "hippolimits.h" 234#include "hippolimits.h"
235 235
236#include "llfloaterteleporthistory.h" 236#include "llfloaterteleporthistory.h"
237#include "slfloatermediafilter.h"
237 238
238using namespace LLVOAvatarDefines; 239using namespace LLVOAvatarDefines;
239void init_client_menu(LLMenuGL* menu); 240void init_client_menu(LLMenuGL* menu);
@@ -5996,6 +5997,10 @@ class LLShowFloater : public view_listener_t
5996 { 5997 {
5997 LLFloaterMute::toggleInstance(); 5998 LLFloaterMute::toggleInstance();
5998 } 5999 }
6000 else if (floater_name == "media filter")
6001 {
6002 SLFloaterMediaFilter::toggleInstance();
6003 }
5999 else if (floater_name == "camera controls") 6004 else if (floater_name == "camera controls")
6000 { 6005 {
6001 LLFloaterCamera::toggleInstance(); 6006 LLFloaterCamera::toggleInstance();
@@ -6161,6 +6166,10 @@ class LLFloaterVisible : public view_listener_t
6161 { 6166 {
6162 new_value = LLFloaterMute::instanceVisible(); 6167 new_value = LLFloaterMute::instanceVisible();
6163 } 6168 }
6169 else if (floater_name == "media filter")
6170 {
6171 new_value = SLFloaterMediaFilter::instanceVisible();
6172 }
6164 else if (floater_name == "camera controls") 6173 else if (floater_name == "camera controls")
6165 { 6174 {
6166 new_value = LLFloaterCamera::instanceVisible(); 6175 new_value = LLFloaterCamera::instanceVisible();