diff options
| author | Jacek Antonelli | 2009-10-09 10:11:45 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-10-09 10:11:45 -0500 |
| commit | bb657bd4244d0b1b80f368a30e40531f573d3c5f (patch) | |
| tree | aef4e3c075ba760f48963d76c9300b6a8b323bf9 /linden/indra/llcommon | |
| parent | Grid manager no longer appends "/" to URIs. (diff) | |
| parent | Fixed money change notification happening after logout/login (diff) | |
| download | meta-impy-bb657bd4244d0b1b80f368a30e40531f573d3c5f.zip meta-impy-bb657bd4244d0b1b80f368a30e40531f573d3c5f.tar.gz meta-impy-bb657bd4244d0b1b80f368a30e40531f573d3c5f.tar.bz2 meta-impy-bb657bd4244d0b1b80f368a30e40531f573d3c5f.tar.xz | |
Merge remote branch 'mccabe/next' into next
Diffstat (limited to 'linden/indra/llcommon')
| -rw-r--r-- | linden/indra/llcommon/llchat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llcommon/llchat.h b/linden/indra/llcommon/llchat.h index 6c75a25..4ec9a08 100644 --- a/linden/indra/llcommon/llchat.h +++ b/linden/indra/llcommon/llchat.h | |||
| @@ -42,7 +42,8 @@ typedef enum e_chat_source_type | |||
| 42 | { | 42 | { |
| 43 | CHAT_SOURCE_SYSTEM = 0, | 43 | CHAT_SOURCE_SYSTEM = 0, |
| 44 | CHAT_SOURCE_AGENT = 1, | 44 | CHAT_SOURCE_AGENT = 1, |
| 45 | CHAT_SOURCE_OBJECT = 2 | 45 | CHAT_SOURCE_OBJECT = 2, |
| 46 | CHAT_SOURCE_OBJECT_IM = 3 | ||
| 46 | } EChatSourceType; | 47 | } EChatSourceType; |
| 47 | 48 | ||
| 48 | typedef enum e_chat_type | 49 | typedef enum e_chat_type |