diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 10:24:45 -0800 | 
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 10:24:45 -0800 | 
| commit | 9459fd9137a2901f964bb307348b13d222c8287b (patch) | |
| tree | 580499326c48072051dd6afcdd475e4676d1837c /indra/llcommon | |
| parent | a328cdc83015a46a87377ad3c822c730c03026a3 (diff) | |
| parent | 092f93b0c1084edf68fc0536aa03a3c7b816505b (diff) | |
PE merge.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llchat.h | 2 | 
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llchat.h b/indra/llcommon/llchat.h index 46456882ba..a77bd211f3 100644 --- a/indra/llcommon/llchat.h +++ b/indra/llcommon/llchat.h @@ -79,6 +79,7 @@ public:  	:	mText(text),  		mFromName(),  		mFromID(), +		mNotifId(),  		mSourceType(CHAT_SOURCE_AGENT),  		mChatType(CHAT_TYPE_NORMAL),  		mAudible(CHAT_AUDIBLE_FULLY), @@ -94,6 +95,7 @@ public:  	std::string		mText;		// UTF-8 line of text  	std::string		mFromName;	// agent or object name  	LLUUID			mFromID;	// agent id or object id +	LLUUID			mNotifId;  	EChatSourceType	mSourceType;  	EChatType		mChatType;  	EChatAudible	mAudible;  | 
