diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llfloaterfonttest.h | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/newview/llfloaterfonttest.h')
| -rw-r--r-- | indra/newview/llfloaterfonttest.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llfloaterfonttest.h b/indra/newview/llfloaterfonttest.h index eb2d410387..4406a9f36a 100644 --- a/indra/newview/llfloaterfonttest.h +++ b/indra/newview/llfloaterfonttest.h @@ -39,14 +39,10 @@ class LLFloaterFontTest: public LLFloater { -public: - static void show(void* unused); - + friend class LLFloaterReg; private: - LLFloaterFontTest(); + LLFloaterFontTest(const LLSD& key); ~LLFloaterFontTest(); - - static LLFloaterFontTest* sInstance; }; #endif |