diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-19 17:25:53 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-19 17:25:53 -0700 |
| commit | 2bf9acabfb534821e5302848860ef6a01af23b1b (patch) | |
| tree | 3fffdc39c3e7904ae0f9995529383a0ecff46b1b /indra/llui/llfloaterreg.cpp | |
| parent | 04d6bd302ba5809dc6aa1c33d91dc0737af6e033 (diff) | |
| parent | 492c93369ccc08dda1f1f51912737dec81d7de83 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
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); |