aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llui.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:54 -0500
committerJacek Antonelli2008-08-15 23:44:54 -0500
commitb2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch)
tree3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/llui/llui.h
parentSecond Life viewer sources 1.14.0.1 (diff)
downloadmeta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz
Second Life viewer sources 1.15.0.2
Diffstat (limited to 'linden/indra/llui/llui.h')
-rw-r--r--linden/indra/llui/llui.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/llui/llui.h b/linden/indra/llui/llui.h
index cd57990..6b8a86a 100644
--- a/linden/indra/llui/llui.h
+++ b/linden/indra/llui/llui.h
@@ -4,6 +4,7 @@
4 * 4 *
5 * Copyright (c) 2001-2007, Linden Research, Inc. 5 * Copyright (c) 2001-2007, Linden Research, Inc.
6 * 6 *
7 * Second Life Viewer Source Code
7 * The source code in this file ("Source Code") is provided by Linden Lab 8 * The source code in this file ("Source Code") is provided by Linden Lab
8 * to you under the terms of the GNU General Public License, version 2.0 9 * to you under the terms of the GNU General Public License, version 2.0
9 * ("GPL"), unless you have obtained a separate licensing agreement 10 * ("GPL"), unless you have obtained a separate licensing agreement
@@ -34,6 +35,7 @@
34#include "llcontrol.h" 35#include "llcontrol.h"
35#include "llrect.h" 36#include "llrect.h"
36#include "llcoord.h" 37#include "llcoord.h"
38#include "llhtmlhelp.h"
37 39
38class LLColor4; 40class LLColor4;
39class LLVector3; 41class LLVector3;
@@ -170,6 +172,7 @@ public:
170 static void setLineWidth(F32 width); 172 static void setLineWidth(F32 width);
171 static LLUUID findAssetUUIDByName(const LLString& name); 173 static LLUUID findAssetUUIDByName(const LLString& name);
172 static LLVector2 getWindowSize(); 174 static LLVector2 getWindowSize();
175 static void setHtmlHelp(LLHtmlHelp* html_help);
173public: 176public:
174 static LLControlGroup* sConfigGroup; 177 static LLControlGroup* sConfigGroup;
175 static LLControlGroup* sColorsGroup; 178 static LLControlGroup* sColorsGroup;
@@ -179,6 +182,7 @@ public:
179 static LLVector2 sGLScaleFactor; 182 static LLVector2 sGLScaleFactor;
180 static LLWindow* sWindow; 183 static LLWindow* sWindow;
181 static BOOL sShowXUINames; 184 static BOOL sShowXUINames;
185 static LLHtmlHelp* sHtmlHelp;
182}; 186};
183 187
184// UI widgets 188// UI widgets