diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-04 21:33:07 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-04 21:33:07 -0800 |
| commit | 613b7a45a783f961a38d7135eb7eeafd572b13b9 (patch) | |
| tree | 5a582d46f5a561cead702837b01ea7ae1af085a2 /indra/llui/llnotifications.cpp | |
| parent | fbc414c02b80da1c0c5c1ebbbbcb84958938be6e (diff) | |
| parent | 6153d09e52c5b41f69533cfe94af94d0f086c6ea (diff) | |
Merge with viewer-chui
Diffstat (limited to 'indra/llui/llnotifications.cpp')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 89fb5ed30c..386345177d 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -475,7 +475,8 @@ LLNotification::LLNotification(const LLSDParamAdapter<Params>& p) : mIgnored(false), mResponderObj(NULL), mId(p.id.isProvided() ? p.id : LLUUID::generateNewID()), - mOfferFromAgent(p.offer_from_agent) + mOfferFromAgent(p.offer_from_agent), + mIsDND(p.is_dnd) { if (p.functor.name.isChosen()) { @@ -517,6 +518,11 @@ LLSD LLNotification::asLLSD() p.expiry = mExpiresAt; p.priority = mPriority; + if(mResponder) + { + p.functor.responder_sd = mResponder->asLLSD(); + } + if(!mResponseFunctorName.empty()) { p.functor.name = mResponseFunctorName; |