diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-05 16:10:58 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-05 16:10:58 -0800 |
| commit | 32d7131b1034d03fa9d3fdde8b86ee9880bb4f67 (patch) | |
| tree | 9c5c871605000578e78c634ace3fc0216b611898 /indra/llui/llnotifications.cpp | |
| parent | a4a2cc62c3411f0391b90d9720a13b49b0e123ef (diff) | |
| parent | ffe80818064572a19b52d4f39f0e14538f701275 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/llui/llnotifications.cpp')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 66144671c9..fd9bfec203 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -475,7 +475,8 @@ LLNotification::LLNotification(const LLSDParamAdapter<Params>& p) : mCancelled(false), mIgnored(false), mResponderObj(NULL), - mId(p.id.isProvided() ? p.id : LLUUID::generateNewID()) + mId(p.id.isProvided() ? p.id : LLUUID::generateNewID()), + mOfferFromAgent(p.offer_from_agent) { if (p.functor.name.isChosen()) { |