diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 09:27:10 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 09:27:10 -0800 |
| commit | 270629a3fe453e75c0ffeb780419ad3e27eeaa34 (patch) | |
| tree | 5bb2f6f3e6871bc0285ed5b34a0166fd25074d68 /indra/llui/llfloaterreg.cpp | |
| parent | a0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (diff) | |
| parent | 6f6d1314e6f1fe12391391172bffa52c9c08e380 (diff) | |
merge from remote repo
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(); |