Some safe merging with v2.

2011-07-14 01:35:15 -05:00
parent 459f00ccb8
commit ce064f5af2
5 changed files with 76 additions and 34 deletions
--- a/indra/llcommon/llchat.h
+++ b/indra/llcommon/llchat.h
@@ -56,7 +56,8 @@ typedef enum e_chat_type
 	CHAT_TYPE_STOP = 5,
 	CHAT_TYPE_DEBUG_MSG = 6,
 	CHAT_TYPE_REGION = 7,
-	CHAT_TYPE_OWNER = 8
+	CHAT_TYPE_OWNER = 8,
+	CHAT_TYPE_DIRECT = 9		// From llRegionSayTo()
 } EChatType;

 typedef enum e_chat_audible_level