summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewscript.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-12-19 09:09:20 -0500
committerOz Linden <oz@lindenlab.com>2014-12-19 09:09:20 -0500
commit1333e9332a074e25178cd28b351bb40998617e10 (patch)
treec229dd9782a27e3c72d7d99c4a6e15367fb8dbd9 /indra/newview/llpreviewscript.h
parent6a3cb427071641585d9beb44c3e46a148f90a791 (diff)
parent4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff)
merge changes for 3.7.23
Diffstat (limited to 'indra/newview/llpreviewscript.h')
-rwxr-xr-xindra/newview/llpreviewscript.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 515f277c4a..66727bceee 100755
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -133,6 +133,7 @@ protected:
void deleteBridges();
void setHelpPage(const std::string& help_string);
void updateDynamicHelp(BOOL immediate = FALSE);
+ bool isKeyword(LLKeywordToken* token);
void addHelpItemToHistory(const std::string& help_string);
static void onErrorList(LLUICtrl*, void* user_data);