From aa6fee292d1721eac6f0f1f270844e01e06979d4 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 3 Jan 2013 14:19:04 -0800
Subject: CHUI-499: Fixed a serialization problem where the a notification's
 objectInfo was not being serialized/deserialized.

---
 indra/llui/llnotifications.cpp | 5 +++++
 indra/llui/llnotifications.h   | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index c9b4399bef..8aa0b6f110 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -517,6 +517,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;
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 42dee4c3e9..2a6391f49e 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -322,11 +322,13 @@ public:
 			Alternative<std::string>										name;
 			Alternative<LLNotificationFunctorRegistry::ResponseFunctor>	function;
 			Alternative<LLNotificationResponderPtr>						responder;
+            Alternative<LLSD>						                    responder_sd;
 
 			Functor()
 			:	name("responseFunctor"),
 				function("functor"),
-				responder("responder")
+				responder("responder"),
+                responder_sd("responder_sd")
 			{}
 		};
 		Optional<Functor>						functor;
-- 
cgit v1.2.3


From 02ca16c1334d1409d8b14136f76305686796c359 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 4 Jan 2013 17:58:30 -0800
Subject: CHUI-499: Now when existing DND mode, stored IM's will not show a
 toast but instead flash the conversation line item and Chat FUI button.

---
 indra/llui/llnotifications.cpp |  3 ++-
 indra/llui/llnotifications.h   | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 8aa0b6f110..9ba598995f 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())
 	{
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 2a6391f49e..092a9acd7c 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -316,6 +316,7 @@ public:
 		Optional<LLNotificationContext*>		context;
 		Optional<void*>							responder;
 		Optional<bool>							offer_from_agent;
+        Optional<bool>							is_dnd;
 
 		struct Functor : public LLInitParam::ChoiceBlock<Functor>
 		{
@@ -342,7 +343,8 @@ public:
 			form_elements("form"),
 			substitutions("substitutions"),
 			expiry("expiry"),
-			offer_from_agent("offer_from_agent", false)
+			offer_from_agent("offer_from_agent", false),
+            is_dnd("is_dnd", false)
 		{
 			time_stamp = LLDate::now();
 			responder = NULL;
@@ -356,7 +358,8 @@ public:
 			form_elements("form"),
 			substitutions("substitutions"),
 			expiry("expiry"),
-			offer_from_agent("offer_from_agent", false)
+			offer_from_agent("offer_from_agent", false),
+            is_dnd("is_dnd", false)
 		{
 			functor.name = _name;
 			name = _name;
@@ -383,6 +386,7 @@ private:
 	void* mResponderObj; // TODO - refactor/remove this field
 	LLNotificationResponderPtr mResponder;
 	bool mOfferFromAgent;
+    bool mIsDND;
 
 	// a reference to the template
 	LLNotificationTemplatePtr mTemplatep;
@@ -523,6 +527,16 @@ public:
 		return mOfferFromAgent;
 	}
 
+    bool isDND() const
+    {
+        return mIsDND;
+    }
+
+    void setDND(const bool flag)
+    {
+        mIsDND = flag;
+    }
+
 	std::string getType() const;
 	std::string getMessage() const;
 	std::string getFooter() const;
-- 
cgit v1.2.3