diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-04-11 17:54:18 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-04-11 17:54:18 +0000 |
| commit | 0277259455c4354f81ea8a24c8ab93f27567bc6f (patch) | |
| tree | f1411dab563dcf697f794e9e8a592a6d3e5c4d2d /indra/llui/llui.h | |
| parent | 568397bbcc4fca307ebc010ec7f815422b9ba80a (diff) | |
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/llui/llui.h')
| -rw-r--r-- | indra/llui/llui.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h index 282e41a113..c8c244072e 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -15,6 +15,7 @@ #include "llcontrol.h" #include "llrect.h" #include "llcoord.h" +#include "llhtmlhelp.h" class LLColor4; class LLVector3; @@ -151,6 +152,7 @@ public: static void setLineWidth(F32 width); static LLUUID findAssetUUIDByName(const LLString& name); static LLVector2 getWindowSize(); + static void setHtmlHelp(LLHtmlHelp* html_help); public: static LLControlGroup* sConfigGroup; static LLControlGroup* sColorsGroup; @@ -160,6 +162,7 @@ public: static LLVector2 sGLScaleFactor; static LLWindow* sWindow; static BOOL sShowXUINames; + static LLHtmlHelp* sHtmlHelp; }; // UI widgets |