diff options
| author | angela <angela@lindenlab.com> | 2009-11-04 11:44:32 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-04 11:44:32 +0800 |
| commit | 1190b5d9eb6f1e1d698430957b99872abd354f81 (patch) | |
| tree | 82915d4b684aaa4cae2d61ebc46a678fcf018c48 /indra/llui/llfloaterreg.cpp | |
| parent | b4af6c3da8e5ef3e897cedfb2e1d677a3f37abe9 (diff) | |
| parent | 3e3ef5c53d2e73c0836ef6056d222c4c35b8ac2d (diff) | |
merge
Diffstat (limited to 'indra/llui/llfloaterreg.cpp')
| -rw-r--r-- | indra/llui/llfloaterreg.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index aca4dc56ee..f8e07913fb 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -134,8 +134,7 @@ LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key) // Note: key should eventually be a non optional LLFloater arg; for now, set mKey to be safe res->mKey = key; res->setInstanceName(name); - res->applyRectControl(); // Can't apply rect control until setting instance name - res->applyDockState();//same... + res->applySavedVariables(); // Can't apply rect and dock state until setting instance name if (res->mAutoTile && !res->getHost() && index > 0) { const LLRect& cur_rect = res->getRect(); |