diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 13:50:26 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 13:50:26 +0000 |
| commit | 2398ac98d01d3809904759251e2c98cf2740e139 (patch) | |
| tree | 644f663d08e39275f76e19a1cab4d34e3cdf75cf /indra/llui/llui.cpp | |
| parent | e2d56363f105f8bef2b05a6bd4c5276db9a60d82 (diff) | |
| parent | c3bd736f6c2d51542fb2894542151282144e7388 (diff) | |
merge from viewer2.
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 c4a529f082..bf5d53ac29 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1928,7 +1928,9 @@ namespace LLInitParam blue("blue"), alpha("alpha"), control("") - {} + { + setBlockFromValue(); + } void TypedParam<LLUIColor>::setValueFromBlock() const { @@ -1973,6 +1975,7 @@ namespace LLInitParam size("size"), style("style") { + setBlockFromValue(); addSynonym(name, ""); } @@ -2013,7 +2016,9 @@ namespace LLInitParam bottom("bottom"), width("width"), height("height") - {} + { + setBlockFromValue(); + } void TypedParam<LLRect>::setValueFromBlock() const { @@ -2098,6 +2103,7 @@ namespace LLInitParam x("x"), y("y") { + setBlockFromValue(); } void TypedParam<LLCoordGL>::setValueFromBlock() const |