summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2009-12-22 17:49:35 +0200
committerIgor Borovkov <iborovkov@productengine.com>2009-12-22 17:49:35 +0200
commit191e5f9ca033cd1520950f35309c0bc2c4499803 (patch)
tree684ccc50f33104413f9c52fe2ee4c3302ec77bb6 /indra/llui/llfloater.cpp
parent304e321f89e9a517ba90d6b41999a65591639ad9 (diff)
parentd4a8f4c6efd11b4cb3ccba320f18e8508668b915 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r--indra/llui/llfloater.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index f7fd2dbdfe..d7a692ec9b 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2717,7 +2717,7 @@ bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr o
}
params.from_xui = true;
- setupParams(params, parent);
+ applyXUILayout(params, parent);
initFromParams(params);
initFloater(params);