diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
| commit | aeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 (patch) | |
| tree | 5aedb2a22e54d9c2c2fe9389d4ad6cebe891c5f1 /indra/llui/llfloater.h | |
| parent | dbf45ad4294a59c050982b5a417fe86272026454 (diff) | |
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/llui/llfloater.h')
| -rw-r--r-- | indra/llui/llfloater.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index d682c7a36a..c9ebd64c28 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -288,8 +288,8 @@ public: void getMinimizePosition( S32 *left, S32 *bottom); void restoreAll(); // un-minimize all floaters typedef std::set<LLView*> skip_list_t; - void LLFloaterView::pushVisibleAll(BOOL visible, const skip_list_t& skip_list = skip_list_t()); - void LLFloaterView::popVisibleAll(const skip_list_t& skip_list = skip_list_t()); + void pushVisibleAll(BOOL visible, const skip_list_t& skip_list = skip_list_t()); + void popVisibleAll(const skip_list_t& skip_list = skip_list_t()); void setCycleMode(BOOL mode); BOOL getCycleMode(); |