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/llui/lldockablefloater.h | |
| 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/llui/lldockablefloater.h')
| -rw-r--r-- | indra/llui/lldockablefloater.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lldockablefloater.h b/indra/llui/lldockablefloater.h index 4d747390af..2b1ce99ae2 100644 --- a/indra/llui/lldockablefloater.h +++ b/indra/llui/lldockablefloater.h @@ -127,7 +127,7 @@ private: void resetInstance(); protected: - void setDockControl(LLDockControl* dockControl, bool docked = true); + void setDockControl(LLDockControl* dockControl); const LLUIImagePtr& getDockTongue(); private: |