diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-24 10:33:14 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-24 10:33:14 -0800 |
| commit | 5ba0c01ae879215a703ce6e68bbf4f7bd8dd8207 (patch) | |
| tree | baf6070a52a8649706b055c360868c9ce14c1c59 /indra/newview/llscriptfloater.cpp | |
| parent | 469af6771d757dd951daaed3e2b1d59ee2127c0e (diff) | |
| parent | 6575b685e91d334198789c88dec2efab7e5a1ac9 (diff) | |
merge with viewer 2 (fix windows build)
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); |