diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 12:09:37 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 12:09:37 -0800 |
commit | e2612effbe463cd89853d3d6a047b3aa7e275975 (patch) | |
tree | 148fb7fb1bdbf84c148d8ccb6496a6fba7ef9afb /indra/llcommon | |
parent | 5a34cf1af83314774f11b0d24279794794bc9147 (diff) | |
parent | fab60b8c05a89498bd8efeafdea8acfa5f94f06c (diff) |
merge from viewer2
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; |