diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-02-16 23:36:54 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-02-16 23:36:54 -0500 |
| commit | e3a71c74e24cc052bab14544730bcd9bcef35ca8 (patch) | |
| tree | 109f6c98feea64f01330960407634eee9196356b /indra/llui/llui.cpp | |
| parent | 69032d8d9d660de5b3c97589b7cc55dac70b153c (diff) | |
| parent | 6552874c82ed5ed09cf0a4d16351cdd5c8698755 (diff) | |
automated merge from viewer-2-0
Diffstat (limited to 'indra/llui/llui.cpp')
| -rw-r--r-- | indra/llui/llui.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 76f07373b4..caf04339c2 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1894,7 +1894,9 @@ namespace LLInitParam blue("blue"), alpha("alpha"), control("") - {} + { + setBlockFromValue(); + } void TypedParam<LLUIColor>::setValueFromBlock() const { @@ -1939,6 +1941,7 @@ namespace LLInitParam size("size"), style("style") { + setBlockFromValue(); addSynonym(name, ""); } @@ -1979,7 +1982,9 @@ namespace LLInitParam bottom("bottom"), width("width"), height("height") - {} + { + setBlockFromValue(); + } void TypedParam<LLRect>::setValueFromBlock() const { @@ -2064,6 +2069,7 @@ namespace LLInitParam x("x"), y("y") { + setBlockFromValue(); } void TypedParam<LLCoordGL>::setValueFromBlock() const |