diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:09:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:09:50 -0500 |
| commit | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (patch) | |
| tree | 55de3117a3937e6258f586fd7a5a5ad294819920 /indra/llcommon/lllslconstants.h | |
| parent | 10cf492ef1730e869389b704345a6604ed363427 (diff) | |
| parent | eacd9d5d590069b56ae3497a3830c5e299475a4a (diff) | |
merge changes for storm-937
Diffstat (limited to 'indra/llcommon/lllslconstants.h')
| -rw-r--r-- | indra/llcommon/lllslconstants.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lllslconstants.h b/indra/llcommon/lllslconstants.h index 539c807020..9f32598e61 100644 --- a/indra/llcommon/lllslconstants.h +++ b/indra/llcommon/lllslconstants.h @@ -181,7 +181,7 @@ 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!!"; +char const* const TEXTBOX_MAGIC_TOKEN = "!!llTextBox!!"; // changed() event flags const U32 CHANGED_NONE = 0x0; |