summaryrefslogtreecommitdiff
path: root/indra/llui/lltexteditor.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-04 16:46:09 -0500
committerOz Linden <oz@lindenlab.com>2011-01-04 16:46:09 -0500
commite2f197b6f77592c84d0c2967cc0e8110c79f2f49 (patch)
treec405316265ca4248802817b8a99697063c58469d /indra/llui/lltexteditor.h
parent2d9c970babf6bab8d402482315af6be0ffb198dd (diff)
parent78895f9e0c628dc33268578faf135e967cf30142 (diff)
merge changes for storm-398
Diffstat (limited to 'indra/llui/lltexteditor.h')
-rw-r--r--indra/llui/lltexteditor.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 58ecefdccb..9e4b95003b 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -315,6 +315,7 @@ private:
BOOL mAllowEmbeddedItems;
bool mShowContextMenu;
+ bool mParseOnTheFly;
LLUUID mSourceID;