diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
| commit | 5c73a908353cdd7210e3148f7162d30afab7873a (patch) | |
| tree | 3ff858042b69b20a9eb3062b7cabd0c390e1b5cf /indra/llcommon | |
| parent | 9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (diff) | |
| parent | 5eee046bb7d62e24df6c35018b3c5383f87ab587 (diff) | |
automated 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; |