diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-05 20:26:26 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-05 20:26:26 -0800 |
| commit | 42a60e6ca5f4179738fa9a7376d1e842bc058ac4 (patch) | |
| tree | 8e1f74ebf472a2ea9ae74f4ea65409c418555218 /indra/llui/llnotifications.cpp | |
| parent | 3a49beed0e96a797a6d663bcae5e932437ca3661 (diff) | |
| parent | 32d7131b1034d03fa9d3fdde8b86ee9880bb4f67 (diff) | |
Pull merge from dev repo
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()) { |