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/llfloaterbump.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/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 |