diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-24 12:44:12 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-24 12:44:12 +0200 |
| commit | 172d9b21ab26927ec35a9210c4e9ce2ec24c9509 (patch) | |
| tree | 041caaa69980ba1bcb0a00c7741b95dd1a4db8cd /indra/newview/llscriptfloater.cpp | |
| parent | a4589431d9db0cb63e79266bb40c010467b624c4 (diff) | |
| parent | d7945e5d31f3cf8da0e21d417ad07459b12e8711 (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llscriptfloater.cpp')
| -rw-r--r-- | indra/newview/llscriptfloater.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index a88a242fbe..32fd42aded 100644 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -283,7 +283,9 @@ void LLScriptFloater::dockToChiclet(bool dock) setSavePosition(false); setDockControl(new LLDockControl(chiclet, this, getDockTongue(), - LLDockControl::TOP, boost::bind(&LLScriptFloater::getAllowedRect, this, _1)), dock); + LLDockControl::TOP, boost::bind(&LLScriptFloater::getAllowedRect, this, _1))); + + setDocked(dock); // Restore saving setSavePosition(save); |