diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
| commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
| tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/llfloaterbuildoptions.h | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/llfloaterbuildoptions.h')
| -rw-r--r-- | indra/newview/llfloaterbuildoptions.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/indra/newview/llfloaterbuildoptions.h b/indra/newview/llfloaterbuildoptions.h index e030b063d9..da72520486 100644 --- a/indra/newview/llfloaterbuildoptions.h +++ b/indra/newview/llfloaterbuildoptions.h @@ -42,19 +42,12 @@ class LLFloaterBuildOptions -: public LLFloater + : public LLFloater, public LLFloaterSingleton<LLFloaterBuildOptions> { + friend class LLUISingleton<LLFloaterBuildOptions, VisibilityPolicy<LLFloater> >; protected: - LLFloaterBuildOptions(); + LLFloaterBuildOptions(const LLSD& key); ~LLFloaterBuildOptions(); - -public: - static void show(void*); - static LLFloaterBuildOptions* getInstance(); - static BOOL visible(void*); - -protected: - static LLFloaterBuildOptions* sInstance; }; #endif |