summaryrefslogtreecommitdiff
path: root/indra/llui/lluictrl.h
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-11-30 15:45:15 -0800
committerJames Cook <james@lindenlab.com>2009-11-30 15:45:15 -0800
commit6feb42e0095cfb46c11897d759bdd03033045f54 (patch)
tree8529b554cd85bee82b7ad8a94e962bab6ca5c7d3 /indra/llui/lluictrl.h
parentd83f934ec87e594b7e88267bdd1be938a73f090d (diff)
De-inlined some UI param block definitions.
Diffstat (limited to 'indra/llui/lluictrl.h')
-rw-r--r--indra/llui/lluictrl.h22
1 files changed, 3 insertions, 19 deletions
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index ac916c9a43..b20ff5d798 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -75,14 +75,7 @@ public:
Optional<std::string> control_name;
- CallbackParam()
- : name("name"),
- function_name("function"),
- parameter("parameter"),
- control_name("control") // Shortcut to control -> "control_name" for backwards compatability
- {
- addSynonym(parameter, "userdata");
- }
+ CallbackParam();
};
struct CommitCallbackParam : public LLInitParam::Block<CommitCallbackParam, CallbackParam >
@@ -105,23 +98,14 @@ public:
Alternative<std::string> enabled;
Alternative<std::string> disabled;
- EnableControls()
- : enabled("enabled_control"),
- disabled("disabled_control")
- {}
+ EnableControls();
};
struct ControlVisibility : public LLInitParam::Choice<ControlVisibility>
{
Alternative<std::string> visible;
Alternative<std::string> invisible;
- ControlVisibility()
- : visible("visibility_control"),
- invisible("invisibility_control")
- {
- addSynonym(visible, "visiblity_control");
- addSynonym(invisible, "invisiblity_control");
- }
+ ControlVisibility();
};
struct Params : public LLInitParam::Block<Params, LLView::Params>
{