diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/newview/llfloatergroups.h | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/newview/llfloatergroups.h')
| -rw-r--r-- | indra/newview/llfloatergroups.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llfloatergroups.h b/indra/newview/llfloatergroups.h index 63b9096e77..a1740861d5 100644 --- a/indra/newview/llfloatergroups.h +++ b/indra/newview/llfloatergroups.h @@ -53,9 +53,9 @@ class LLScrollListCtrl; class LLButton; class LLFloaterGroupPicker; -class LLFloaterGroupPicker : public LLFloater, public LLUIInstanceMgr<LLFloaterGroupPicker> +class LLFloaterGroupPicker : public LLFloater, public LLUIFactory<LLFloaterGroupPicker, LLFloaterGroupPicker, VisibilityPolicy<LLFloater> > { - friend class LLUIInstanceMgr<LLFloaterGroupPicker>; + friend class LLUIFactory<LLFloaterGroupPicker>; public: ~LLFloaterGroupPicker(); void setSelectCallback( void (*callback)(LLUUID, void*), @@ -63,11 +63,13 @@ public: void setPowersMask(U64 powers_mask); BOOL postBuild(); + // implementation of factory policy + static LLFloaterGroupPicker* findInstance(const LLSD& seed); + static LLFloaterGroupPicker* createInstance(const LLSD& seed); + protected: LLFloaterGroupPicker(const LLSD& seed); void ok(); - static LLFloaterGroupPicker* findInstance(const LLSD& seed); - static LLFloaterGroupPicker* createInstance(const LLSD& seed); static void onBtnOK(void* userdata); static void onBtnCancel(void* userdata); |