diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-26 13:13:26 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-26 13:13:26 -0500 |
commit | 3b52ab6cf17ceae4a2d45a8477b8643a9e3c6162 (patch) | |
tree | 58491dbe94278921244e05927d0d58b580304646 /indra/newview/llscriptfloater.cpp | |
parent | 27c83bf399f2ca91f0444aa97a98af00a2483c30 (diff) | |
parent | 470c05b70808f0a51090c0f50847fe614bf041e9 (diff) |
merge
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); |