diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-03-25 20:15:51 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-03-25 20:15:51 -0400 |
commit | 0a56031bd3e3645a9e5124a722cece0706469944 (patch) | |
tree | 39e2244564d2b71d8277231f691160807f8c10b9 /indra/llmessage/llinstantmessage.cpp | |
parent | 885fc3f9b54cca33e134bcfb65c1d2a9c0aeec7a (diff) | |
parent | fad31dc087cb670bd4479195cac2c31da9a55e57 (diff) |
automated merge
Diffstat (limited to 'indra/llmessage/llinstantmessage.cpp')
-rw-r--r-- | indra/llmessage/llinstantmessage.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmessage/llinstantmessage.cpp b/indra/llmessage/llinstantmessage.cpp index a9e1ee77ef..57e8a22546 100644 --- a/indra/llmessage/llinstantmessage.cpp +++ b/indra/llmessage/llinstantmessage.cpp @@ -61,6 +61,7 @@ const char EMPTY_BINARY_BUCKET[] = ""; const S32 EMPTY_BINARY_BUCKET_SIZE = 1; const U32 NO_TIMESTAMP = 0; const std::string SYSTEM_FROM("Second Life"); +const std::string INTERACTIVE_SYSTEM_FROM("F387446C-37C4-45f2-A438-D99CBDBB563B"); const S32 IM_TTL = 1; |