From 24b26d71ee01211aa796b8061b66ec06a133e4ce Mon Sep 17 00:00:00 2001 From: Dave Simmons Date: Fri, 20 Mar 2009 20:00:47 +0000 Subject: svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge latest 1.26 into trunk --- indra/newview/llfloatersettingsdebug.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloatersettingsdebug.cpp') diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp index f6002653ab..2677467611 100644 --- a/indra/newview/llfloatersettingsdebug.cpp +++ b/indra/newview/llfloatersettingsdebug.cpp @@ -61,7 +61,10 @@ BOOL LLFloaterSettingsDebug::postBuild() f(LLComboBox* c) : combo(c) {} virtual void apply(const std::string& name, LLControlVariable* control) { - combo->add(name, (void*)control); + if (!control->isHiddenFromSettingsEditor()) + { + combo->add(name, (void*)control); + } } } func(settings_combo); -- cgit v1.3