summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterfonttest.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterfonttest.h')
-rw-r--r--indra/newview/llfloaterfonttest.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/indra/newview/llfloaterfonttest.h b/indra/newview/llfloaterfonttest.h
index 45ff890423..4406a9f36a 100644
--- a/indra/newview/llfloaterfonttest.h
+++ b/indra/newview/llfloaterfonttest.h
@@ -5,7 +5,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -13,12 +13,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
@@ -38,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