diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-03 11:26:25 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-03 11:26:25 +0000 |
commit | 6ecec59fda7d248d2640cb0a4fd95276604755a9 (patch) | |
tree | 063583a1f9f7441356814be5891e6a7bcc61b9d4 /indra/llcommon | |
parent | 1eff2a33b1fab8ebe757ce30b36dc71df5b58cb9 (diff) | |
parent | 5777dfaae6268dffee83d7a457c024b1a89f81ff (diff) |
Merge from viewer-2-0
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/llchat.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llcommon/llchat.h b/indra/llcommon/llchat.h index a77bd211f3..f1b9091298 100644 --- a/indra/llcommon/llchat.h +++ b/indra/llcommon/llchat.h @@ -43,7 +43,8 @@ typedef enum e_chat_source_type { CHAT_SOURCE_SYSTEM = 0, CHAT_SOURCE_AGENT = 1, - CHAT_SOURCE_OBJECT = 2 + CHAT_SOURCE_OBJECT = 2, + CHAT_SOURCE_UNKNOWN = 3 } EChatSourceType; typedef enum e_chat_type @@ -68,7 +69,8 @@ typedef enum e_chat_audible_level typedef enum e_chat_style { CHAT_STYLE_NORMAL, - CHAT_STYLE_IRC + CHAT_STYLE_IRC, + CHAT_STYLE_HISTORY }EChatStyle; // A piece of chat |