From 51ed4c977a637063e63c8a3e447a2f7506d2b382 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Sat, 18 Oct 2014 12:14:33 -0700
Subject: Update to build on Xcode 6.0: remove lots of unused variables

---
 indra/newview/llfloaterpay.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/llfloaterpay.cpp')

diff --git a/indra/newview/llfloaterpay.cpp b/indra/newview/llfloaterpay.cpp
index f0c010b545..099a8828a4 100755
--- a/indra/newview/llfloaterpay.cpp
+++ b/indra/newview/llfloaterpay.cpp
@@ -117,7 +117,6 @@ protected:
 
 
 S32 LLFloaterPay::sLastAmount = 0;
-const S32 MAX_AMOUNT_LENGTH = 10;
 const S32 FASTPAY_BUTTON_WIDTH = 80;
 
 LLFloaterPay::LLFloaterPay(const LLSD& key)
-- 
cgit v1.2.3


From 11ed48abd15d0fcc1e41a9a122a081785d82f917 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 14 Apr 2015 21:21:29 +0300
Subject: MAINT-5097 FIXED crash in LLFloaterPay::onGive

---
 indra/newview/llfloaterpay.cpp | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llfloaterpay.cpp')

diff --git a/indra/newview/llfloaterpay.cpp b/indra/newview/llfloaterpay.cpp
index 172f81d078..31245db344 100755
--- a/indra/newview/llfloaterpay.cpp
+++ b/indra/newview/llfloaterpay.cpp
@@ -367,7 +367,8 @@ void LLFloaterPay::payViaObject(money_callback callback, LLSafeHandle<LLObjectSe
 	LLSelectNode* node = selection->getFirstRootNode();
 	if (!node) 
 	{
-		//FIXME: notify user object no longer exists
+		// object no longer exists
+		LLNotificationsUtil::add("PayObjectFailed");
 		floater->closeFloater();
 		return;
 	}
@@ -491,12 +492,22 @@ void LLFloaterPay::onGive(void* data)
 		}
 		if (amount > PAY_AMOUNT_NOTIFICATION && gStatusBar && gStatusBar->getBalance() > amount)
 		{
-			LLUUID payee_id;
-			BOOL is_group;
+			LLUUID payee_id = LLUUID::null;
+			BOOL is_group = false;
 			if (floater->mObjectSelection.notNull())
 			{
 				LLSelectNode* node = floater->mObjectSelection->getFirstRootNode();
-				node->mPermissions->getOwnership(payee_id, is_group);
+				if (node)
+				{
+					node->mPermissions->getOwnership(payee_id, is_group);
+				}
+				else
+				{
+					// object no longer exists
+					LLNotificationsUtil::add("PayObjectFailed");
+					floater->closeFloater();
+					return;
+				}
 			}
 			else
 			{
@@ -562,6 +573,10 @@ void LLFloaterPay::give(S32 amount)
 					msg->sendReliable( region->getHost() );
 				}
 			}
+			else
+			{
+				LLNotificationsUtil::add("PayObjectFailed");
+			}
 		}
 		else
 		{
-- 
cgit v1.2.3