diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-03 09:44:09 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-03 09:44:09 -0800 |
commit | a0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (patch) | |
tree | 279f3421a88280d6003d6973dcb5556702e2c52f /indra/llui/llfloaterreg.cpp | |
parent | c59e2d21174415842b1418c5f389becb7c013706 (diff) | |
parent | c9d121dd01625790cb963372c861f8e4072430d2 (diff) |
merge from remote repo
Diffstat (limited to 'indra/llui/llfloaterreg.cpp')
-rw-r--r-- | indra/llui/llfloaterreg.cpp | 1 |
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(); |