summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-11-08 14:02:07 -0500
committerOz Linden <oz@lindenlab.com>2011-11-08 14:02:07 -0500
commitde825f2cbe69f884c1efdcf3e93af5e28f00e3e0 (patch)
treefeec84f56053c596ecbf1d9b3b7c3d5ee0a7dff3
parentf504270121075323b723407bcfaac1020d1a1a0d (diff)
parent26b6dd4cf568b345f2350053b840adb8ed6203de (diff)
merge changes for storm-1677
-rw-r--r--indra/llui/llkeywords.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h
index d050cd7d7c..ac34015393 100644
--- a/indra/llui/llkeywords.h
+++ b/indra/llui/llkeywords.h
@@ -51,7 +51,7 @@ public:
* - TWO_SIDED_DELIMITER are for delimiters that end with a different delimiter than they open with.
* - DOUBLE_QUOTATION_MARKS are for delimiting areas using the same delimiter to open and close.
*/
- typedef enum TOKEN_TYPE
+ enum TOKEN_TYPE
{
WORD,
LINE,