summaryrefslogtreecommitdiff
path: root/indra/llui/lluictrlfactory.h
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-12-16 16:04:09 -0800
committerJames Cook <james@lindenlab.com>2009-12-16 16:04:09 -0800
commite8fe81c4fcbec173606b5ad635e0b774e4d8b24b (patch)
tree4ec27288a9621edaa9007f986ac1fee6232759bf /indra/llui/lluictrlfactory.h
parent3a02b9ec882c98009ae6c24913ee8a7a620b0f87 (diff)
Backed out changeset: cfa60aef8061, added setBlockFromValue so setting a LLRect param in code will set the individua
Diffstat (limited to 'indra/llui/lluictrlfactory.h')
-rw-r--r--indra/llui/lluictrlfactory.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index 6dab9521bb..e4bac48fd3 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -182,6 +182,9 @@ public:
template<typename T>
static T* createWidget(typename T::Params& params, LLView* parent = NULL)
{
+ // Apply layout transformations, usually munging rect
+ T::setupParams(params, parent);
+
T* widget = NULL;
if (!params.validateBlock())
@@ -306,8 +309,7 @@ fail:
output_node, output_params, &default_params);
}
- // Apply layout transformations, usually munging rect
- T::setupParams(params, parent);
+ params.from_xui = true;
T* widget = createWidget<T>(params, parent);