diff options
| author | Don Kjer <don@lindenlab.com> | 2008-05-19 17:02:33 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2008-05-19 17:02:33 +0000 |
| commit | 38558960978a0741dd9c79c4c7a108b8a1f99eff (patch) | |
| tree | b7221183a7c91c1097a78cf5875197431852b0b8 /indra/llcommon/lllslconstants.h | |
| parent | e77de5d685ae441f72920f0e04d9887ee958745a (diff) | |
EFFECTIVE MERGES:
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
dataserver-is-deprecated
Diffstat (limited to 'indra/llcommon/lllslconstants.h')
| -rw-r--r-- | indra/llcommon/lllslconstants.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/lllslconstants.h b/indra/llcommon/lllslconstants.h index e4c83582ce..12467e4e63 100644 --- a/indra/llcommon/lllslconstants.h +++ b/indra/llcommon/lllslconstants.h @@ -181,4 +181,7 @@ const S32 OBJECT_OWNER = 6; const S32 OBJECT_GROUP = 7; const S32 OBJECT_CREATOR = 8; +// llTextBox() magic token string - yes this is a hack. sue me. +const std::string TEXTBOX_MAGIC_TOKEN = "!!llTextBox!!"; + #endif |