diff options
| author | Jacek Antonelli | 2009-10-13 20:20:37 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-10-13 20:20:37 -0500 |
| commit | 20235c92e6e0deddf3c8582bbed75361e24ecc0d (patch) | |
| tree | 754db362c0ad8060ceaa3ed24059e320f4b13f5c /linden/indra/newview/llfloaterwindlight.h | |
| parent | Merge remote branch 'mccabe/next' into next (diff) | |
| parent | Added history button for group chat as well (diff) | |
| download | meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.zip meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.tar.gz meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.tar.bz2 meta-impy-20235c92e6e0deddf3c8582bbed75361e24ecc0d.tar.xz | |
Merge remote branch 'mccabe/next' into next
Diffstat (limited to 'linden/indra/newview/llfloaterwindlight.h')
| -rw-r--r-- | linden/indra/newview/llfloaterwindlight.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterwindlight.h b/linden/indra/newview/llfloaterwindlight.h index 70e76c5..130a9a7 100644 --- a/linden/indra/newview/llfloaterwindlight.h +++ b/linden/indra/newview/llfloaterwindlight.h | |||
| @@ -131,6 +131,8 @@ public: | |||
| 131 | /// turn off animated skies | 131 | /// turn off animated skies |
| 132 | static void deactivateAnimator(); | 132 | static void deactivateAnimator(); |
| 133 | 133 | ||
| 134 | static void selectTab(std::string tab_name); | ||
| 135 | |||
| 134 | private: | 136 | private: |
| 135 | // one instance on the inside | 137 | // one instance on the inside |
| 136 | static LLFloaterWindLight* sWindLight; | 138 | static LLFloaterWindLight* sWindLight; |