diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-03-19 09:46:24 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-03-19 09:46:24 -0700 |
| commit | 40e04fdb3b416a686c66989ee5d44c5eaf97b9fd (patch) | |
| tree | 537b95c75bdb4a96a9f663895f89cb73f54c8f67 /indra/llmessage | |
| parent | 70df3c1fa72ae8ecddf144452b4fe032ad48182e (diff) | |
| parent | 1a28e325c4d148d2322bc9becb672abf99315a96 (diff) | |
Merge with tip
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llinstantmessage.cpp | 1 | ||||
| -rw-r--r-- | indra/llmessage/llinstantmessage.h | 1 |
2 files changed, 2 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; diff --git a/indra/llmessage/llinstantmessage.h b/indra/llmessage/llinstantmessage.h index 272e753f3c..f11b649f78 100644 --- a/indra/llmessage/llinstantmessage.h +++ b/indra/llmessage/llinstantmessage.h @@ -226,6 +226,7 @@ extern const S32 EMPTY_BINARY_BUCKET_SIZE; extern const U32 NO_TIMESTAMP; extern const std::string SYSTEM_FROM; +extern const std::string INTERACTIVE_SYSTEM_FROM; // Number of retry attempts on sending the im. extern const S32 IM_TTL; |