summaryrefslogtreecommitdiff
path: root/indra/llui/llfloaterreg.cpp
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-11-02 11:17:52 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-11-02 11:17:52 -0800
commit7ff2bfd0af6e124d74a7c1c9532fcffff5e0d7fe (patch)
treea0ec093a39c82f2bdd25ee0660f27ebb7f929116 /indra/llui/llfloaterreg.cpp
parentc8e97d83bd330103a24755692e3d409015be5a66 (diff)
parent5b7f40df4e2125cee36fdeed53a10e6ebd624929 (diff)
merge changes from product-engine
Diffstat (limited to 'indra/llui/llfloaterreg.cpp')
-rw-r--r--indra/llui/llfloaterreg.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp
index 8bb9e0d9ff..aca4dc56ee 100644
--- a/indra/llui/llfloaterreg.cpp
+++ b/indra/llui/llfloaterreg.cpp
@@ -135,6 +135,7 @@ LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key)
res->mKey = key;
res->setInstanceName(name);
res->applyRectControl(); // Can't apply rect control until setting instance name
+ res->applyDockState();//same...
if (res->mAutoTile && !res->getHost() && index > 0)
{
const LLRect& cur_rect = res->getRect();