diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-10-19 17:33:27 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-19 17:33:27 -0700 |
commit | 6d546f1fc3386a05a06c5b1a0ea9e84506380bb1 (patch) | |
tree | 1f2f6f04c5ecfb7a1eb8de09b6a8c6aa1dd15eef /indra/llui/llfloaterreg.cpp | |
parent | f3a4a48d8ed20b4bbd65d7cdb9b191c9faf2544b (diff) | |
parent | 2bf9acabfb534821e5302848860ef6a01af23b1b (diff) |
Merge
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 df3cff9968..e144b68f5e 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -167,6 +167,7 @@ LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key) res->setInstanceName(name); LLFloater *last_floater = (list.empty() ? NULL : list.back()); + res->applyControlsAndPosition(last_floater); gFloaterView->adjustToFitScreen(res, false); |