diff options
| author | skolb <none@none> | 2009-12-11 08:49:37 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-11 08:49:37 -0800 |
| commit | 6542ffe2f05c47d74dfbe659041d956d609f91f3 (patch) | |
| tree | 7794c0737c5a78b0339c2c34b47c9d32c44de749 /indra/llui/lldockablefloater.h | |
| parent | 431bfca2ade364dc1165e402537e5e2d3616ebfd (diff) | |
| parent | eda8634b17133df5f3104d96ad56d3626a90aad8 (diff) | |
Merge viewer 2-0 into media
Diffstat (limited to 'indra/llui/lldockablefloater.h')
| -rw-r--r-- | indra/llui/lldockablefloater.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lldockablefloater.h b/indra/llui/lldockablefloater.h index 46491d8a29..2c339f4a3f 100644 --- a/indra/llui/lldockablefloater.h +++ b/indra/llui/lldockablefloater.h @@ -83,6 +83,8 @@ public: virtual void onDockHidden(); virtual void onDockShown(); + LLDockControl* getDockControl(); + private: /** * Provides unique of dockable floater. @@ -92,7 +94,6 @@ private: protected: void setDockControl(LLDockControl* dockControl); - LLDockControl* getDockControl(); const LLUIImagePtr& getDockTongue(); private: |