summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorChuck Linden <chuck@lindenlab.com>2010-02-19 14:32:55 -0500
committerChuck Linden <chuck@lindenlab.com>2010-02-19 14:32:55 -0500
commit9aee0cfa716736659af777c9fccd60b8618dc9d4 (patch)
treebd6f329c88fc27fb697f6660d9eb51bcb14b9585 /indra/llcommon
parentcd9a2a6a4ab8d1d989110908a3702ba34d1f6168 (diff)
parent65f8b95ae8e93c3b946e43eea89bcb631723ca6c (diff)
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llchat.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llchat.h b/indra/llcommon/llchat.h
index a77bd211f3..52238d4533 100644
--- a/indra/llcommon/llchat.h
+++ b/indra/llcommon/llchat.h
@@ -68,7 +68,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