diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-06 21:43:19 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-06 21:43:19 +0200 |
| commit | 567df7bf275dfd33cf1b1fea945e3e544571b4aa (patch) | |
| tree | a0424cde27634e1749f7449e5f04e3418d0e8ca9 /indra/llui/llnotifications.cpp | |
| parent | 272d438ce299fab146e9a30046b7591de7467511 (diff) | |
| parent | 32d7131b1034d03fa9d3fdde8b86ee9880bb4f67 (diff) | |
merge
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()) { |