diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
| commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
| tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/newview/llfloaterbump.h | |
| parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) | |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/newview/llfloaterbump.h')
| -rw-r--r-- | indra/newview/llfloaterbump.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/llfloaterbump.h b/indra/newview/llfloaterbump.h index eb15671d41..f55a9e6bc5 100644 --- a/indra/newview/llfloaterbump.h +++ b/indra/newview/llfloaterbump.h @@ -40,18 +40,17 @@ class LLMeanCollisionData; class LLScrollListCtrl; class LLFloaterBump -: public LLFloater +: public LLFloater, public LLFloaterSingleton<LLFloaterBump> { -public: - static void show(void *); - -private: - LLFloaterBump(); + friend class LLUISingleton<LLFloaterBump, VisibilityPolicy<LLFloater> >; +protected: + LLFloaterBump(const LLSD& key); virtual ~LLFloaterBump(); - static void add(LLScrollListCtrl* list, LLMeanCollisionData *mcd); -private: - static LLFloaterBump* sInstance; + void add(LLScrollListCtrl* list, LLMeanCollisionData *mcd); + +public: + /*virtual*/ void onOpen(const LLSD& key); }; #endif |