diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 11:17:52 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 11:17:52 -0800 |
| commit | 7ff2bfd0af6e124d74a7c1c9532fcffff5e0d7fe (patch) | |
| tree | a0ec093a39c82f2bdd25ee0660f27ebb7f929116 /indra/llui | |
| parent | c8e97d83bd330103a24755692e3d409015be5a66 (diff) | |
| parent | 5b7f40df4e2125cee36fdeed53a10e6ebd624929 (diff) | |
merge changes from product-engine
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloaterreg.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/lliconctrl.cpp | 1 |
2 files changed, 2 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(); diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp index b1bd2b89a9..1e2353b488 100644 --- a/indra/llui/lliconctrl.cpp +++ b/indra/llui/lliconctrl.cpp @@ -125,3 +125,4 @@ void LLIconCtrl::setIconImageDrawSize() } } + |