From 14ebeffe8776562c0ac9711a44b7ebe3dec49c47 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Wed, 27 Jun 2012 11:32:54 -0700
Subject: MAINT-1078 Merchant Outbox import failures Add 1s throttle on update
 checks for importer reviewed with Simon

---
 indra/newview/llmarketplacefunctions.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 93dd82957f..51df868faa 100644
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -336,13 +336,19 @@ namespace LLMarketplaceImport
 // Interface class
 //
 
+static const F32 MARKET_IMPORTER_UPDATE_FREQUENCY = 1.0f;
 
 //static
 void LLMarketplaceInventoryImporter::update()
 {
 	if (instanceExists())
 	{
-		LLMarketplaceInventoryImporter::instance().updateImport();
+		static LLTimer update_timer;
+		if (update_timer.hasExpired())
+		{
+			LLMarketplaceInventoryImporter::instance().updateImport();
+			update_timer.setTimerExpirySec(MARKET_IMPORTER_UPDATE_FREQUENCY);
+		}
 	}
 }
 
-- 
cgit v1.3


From 7f38f620fd9c3e9de5453f47b942f4dd3b5d2e77 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 27 Jun 2012 17:16:59 -0500
Subject: MAINT-1204 Fix for crash on selecting a texture anywhere other than
 the build tools.

---
 indra/newview/lltexturectrl.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 6703ef4a41..ec36cf48c2 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -819,7 +819,10 @@ void LLFloaterTexturePicker::onSelectionChange(const std::deque<LLFolderViewItem
 		mNoCopyTextureSelected = FALSE;
 		if (itemp)
 		{
-			mTextureSelectedCallback(itemp);
+			if (!mTextureSelectedCallback.empty())
+			{
+				mTextureSelectedCallback(itemp);
+			}
 			if (!itemp->getPermissions().allowCopyBy(gAgent.getID()))
 			{
 				mNoCopyTextureSelected = TRUE;
-- 
cgit v1.3


From 326634e1bf9b87e9c9311b67539abb43323bd33c Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 28 Jun 2012 15:41:09 -0400
Subject: Added tag 3.3.4-beta1 for changeset f91d003091a6

---
 .hgtags | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgtags b/.hgtags
index 0bca1f09ab..4922a51e57 100644
--- a/.hgtags
+++ b/.hgtags
@@ -330,3 +330,5 @@ af5f3e43e6e4424b1da19d9e16f6b853a7b822ed DRTVWR-169
 09ef7fd1b0781f33b8a3a9af6236b7bcb4831910 DRTVWR-170
 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1
 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 DRTVWR-158
+f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1
+f91d003091a61937a044652c4c674447f7dcbb7a 3.3.4-beta1
-- 
cgit v1.3


From a6b5b4322cffe7334f00895e1c0b9618c2f43f4a Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 29 Jun 2012 16:15:11 -0400
Subject: tag merge of DRTVWR-173

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0bca1f09ab..16c898513b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -330,3 +330,4 @@ af5f3e43e6e4424b1da19d9e16f6b853a7b822ed DRTVWR-169
 09ef7fd1b0781f33b8a3a9af6236b7bcb4831910 DRTVWR-170
 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1
 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 DRTVWR-158
+bce218b2b45b730b22cc51e4807aa8b571cadef3 DRTVWR-173
-- 
cgit v1.3


From a49a47def661873100e3d7290fe74c25fb5de472 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 29 Jun 2012 16:24:04 -0400
Subject: tag merge of DRTVWR-174

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0bca1f09ab..db8806f0b7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -330,3 +330,4 @@ af5f3e43e6e4424b1da19d9e16f6b853a7b822ed DRTVWR-169
 09ef7fd1b0781f33b8a3a9af6236b7bcb4831910 DRTVWR-170
 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1
 f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 DRTVWR-158
+cbea6356ce9cb0c313b6777f10c5c14783264fcc DRTVWR-174
-- 
cgit v1.3


From 077e851bdd8e46fa9d5a43712dacdf5945a979f7 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Sat, 30 Jun 2012 06:12:06 -0400
Subject: Added tag 3.3.4-beta2 for changeset 82b5330bc8b1

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index bca3b65674..49faada70a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -334,3 +334,4 @@ f87bfbe0b62d26f451d02a47c80ebef6b9168fc2 3.3.4-beta1
 cbea6356ce9cb0c313b6777f10c5c14783264fcc DRTVWR-174
 bce218b2b45b730b22cc51e4807aa8b571cadef3 DRTVWR-173
 f91d003091a61937a044652c4c674447f7dcbb7a 3.3.4-beta1
+82b5330bc8b17d0d4b598832e9c5a92e90075682 3.3.4-beta2
-- 
cgit v1.3