summaryrefslogtreecommitdiff
path: root/indra/llui/llui.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-10-14 17:25:24 -0700
committerMerov Linden <merov@lindenlab.com>2013-10-14 17:25:24 -0700
commitf6c7b906e1f1d1bcc56a1e71b1867a58c5b2381a (patch)
treeec9226508d7a3e1555b774fde915a8b299b35cd7 /indra/llui/llui.h
parentc2f5365f986aab49d5c7cfa2834a68f5b35c09c2 (diff)
parent04b84ce07dd5bc8364f948ef0004e3dc5328f1b4 (diff)
Pull merge with lindenlab/viewer-bear
Diffstat (limited to 'indra/llui/llui.h')
-rwxr-xr-xindra/llui/llui.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index 0a0e0e164e..0bc4424a8c 100755
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -405,11 +405,6 @@ public:
const std::string& comment = "Declared In Code")
: LLCachedControl<T>(LLUI::getControlControlGroup(name), name, default_value, comment)
{}
-
- // This constructor will signal an error if the control doesn't exist in the control group
- LLUICachedControl(const std::string& name)
- : LLCachedControl<T>(LLUI::getControlControlGroup(name), name)
- {}
};
namespace LLInitParam