From 0f8fbcfcc148724f012b0b5393b5fd4937ebadb8 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 11 Jul 2012 10:47:40 -0400
Subject: [PATCH 01/12] Disallow the user from self-muting and remove them from
 the mutelist if this was the case.

Works around other viewers allowing the user to mute themself.
---
 indra/newview/llmutelist.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp
index 752e9be35..efeb7c557 100644
--- a/indra/newview/llmutelist.cpp
+++ b/indra/newview/llmutelist.cpp
@@ -688,6 +688,12 @@ BOOL LLMuteList::isMuted(const LLUUID& id, const std::string& name, U32 flags) c
 
 	// don't need name or type for lookup
 	LLMute mute(id_to_check);
+	// Can't mute self.
+	if (mute.mID == gAgent.getID() && !mute_object)
+	{
+		getInstance()->remove(mute);
+		return false;
+	}
 	mute_set_t::const_iterator mute_it = mMutes.find(mute);
 	if (mute_it != mMutes.end())
 	{

From 75f067d5c9162a50524c0d2a89d6b4f03e50cc78 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Thu, 12 Jul 2012 13:35:56 -0400
Subject: [PATCH 02/12] Added crossfade checkbox to Windlight remote panel.

---
 .../skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml b/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
index 2ab05206e..5292e89e3 100644
--- a/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
+++ b/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
@@ -14,8 +14,9 @@
 	<combo_box name="WLWaterPresetsCombo" bottom_delta="1" left_delta="20" height="18" width="133" tool_tip="WindLight Presets for your Water."/>
 	<button bottom_delta="0" height="18" label="&lt;" left="158" image_overlay="arrow_left.tga" name="WWprev" width="18"/>
 	<button bottom_delta="0" height="18" label="&gt;" left_delta="18" image_overlay="arrow_right.tga" name="WWnext" width="18"/>
-	<check_box left="5" label="Region Environment" control_name="UseEnvironmentFromRegion" height="16" name="use_estate_wl" tool_tip="Use the region/parcel's windlight settings when available."/>
+	<check_box left="5" label="Region WL" control_name="UseEnvironmentFromRegion" height="16" name="use_estate_wl" tool_tip="Use the region's windlight settings when available."/>
 <!--check_box bottom_delta="0" left_delta="125" label="Always?" control_name="UseEnvironmentFromRegionAlways" height="16" name="Always" tool_tip="Always use region/parcel settings when they exist, automatically."/-->
+	<check_box bottom_delta="0" left_delta="110" label="Crossfade?" control_name="PhoenixInterpolateSky" height="16" name="Crossfade" tool_tip="If unchecked, Sky Windlight settings changes will apply immediately, without hesitation/animation."/>
 	<icon bottom_delta="-18" height="14" image_name="icon_day_cycle.tga" left="10" width="150"/>
 	<slider bottom_delta="-8" control_name="EnvTimeSlider" left="5" height="10" increment="0.00000001" label="" max_val="1" min_val="0" name="EnvTimeSlider" show_text="false" width="160"/>
 	<button bottom="1" height="22" label="" left="172" name="expand" scale_image="true" toggle="true" tool_tip="Hide the Settings Panel" width="22"/>

From 539b6410fabf5b5f690adeeba7576d0d7269e7ca Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Thu, 12 Jul 2012 16:09:42 -0500
Subject: [PATCH 03/12] Brought back the inventory item count display after
 loading has completed.

---
 indra/newview/llpanelmaininventory.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index d2cbb0ca2..097d0fda6 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -858,12 +858,15 @@ void LLInventoryView::updateItemcountText()
 {
 	std::ostringstream title;
 	title << "Inventory";
- 	if (LLInventoryModelBackgroundFetch::instance().folderFetchActive())
+ 	if (LLInventoryModelBackgroundFetch::instance().folderFetchActive() || LLInventoryModelBackgroundFetch::instance().isEverythingFetched())
 	{
 		LLLocale locale(LLLocale::USER_LOCALE);
 		std::string item_count_string;
 		LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount());
-		title << " (Fetched " << item_count_string << " items...)";
+		if(LLInventoryModelBackgroundFetch::instance().folderFetchActive())
+			title << " (Fetched " << item_count_string << " items...)";
+		else
+			title << " ("<< item_count_string << " items)";
 	}
 	title << mFilterText;
 	setTitle(title.str());

From 1d60131df7413070ee245e38765981dc06e6a8af Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Thu, 12 Jul 2012 16:25:27 -0500
Subject: [PATCH 04/12] Avoid switch statement in shaders on nvidia hardware,
 since some driver versions don't behave properly, apparently..

---
 indra/llrender/llshadermgr.cpp | 37 +++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 63e0d3e83..0c17fbfb5 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -718,20 +718,33 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 		}
 		else if (major_version > 1 || minor_version >= 30)
 		{  //switches are supported in GLSL 1.30 and later
-			text[count++] = strdup("\tvec4 ret = vec4(1,0,1,1);\n");
-			text[count++] = strdup("\tswitch (vary_texture_index.r)\n");
-			text[count++] = strdup("\t{\n");
-		
-			//switch body
-			for (S32 i = 0; i < texture_index_channels; ++i)
-			{
-				std::string case_str = llformat("\t\tcase %d: ret = texture2D(tex%d, texcoord); break;\n", i, i);
-				text[count++] = strdup(case_str.c_str());
+			if (gGLManager.mIsNVIDIA)
+			{ //switches are unreliable on some NVIDIA drivers
+				for (S32 i = 0; i < texture_index_channels; ++i)
+				{
+					std::string if_string = llformat("\t%sif (vary_texture_index.r == %d) { return texture2D(tex%d, texcoord); }\n", i > 0 ? "else " : "", i, i); 
+					text[count++] = strdup(if_string.c_str());
+				}
+				text[count++] = strdup("\treturn vec4(1,0,1,1);\n");
+				text[count++] = strdup("}\n");
 			}
+			else
+			{
+				text[count++] = strdup("\tvec4 ret = vec4(1,0,1,1);\n");
+				text[count++] = strdup("\tswitch (vary_texture_index.r)\n");
+				text[count++] = strdup("\t{\n");
+		
+				//switch body
+				for (S32 i = 0; i < texture_index_channels; ++i)
+				{
+					std::string case_str = llformat("\t\tcase %d: ret = texture2D(tex%d, texcoord); break;\n", i, i);
+					text[count++] = strdup(case_str.c_str());
+				}
 
-			text[count++] = strdup("\t}\n");
-			text[count++] = strdup("\treturn ret;\n");
-			text[count++] = strdup("}\n");
+				text[count++] = strdup("\t}\n");
+				text[count++] = strdup("\treturn ret;\n");
+				text[count++] = strdup("}\n");
+			}
 		}
 		else
 		{ //should never get here.  Indexed texture rendering requires GLSL 1.30 or later 

From f8445030c7df979222b5643e27b603fc8074e18f Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Thu, 12 Jul 2012 16:33:05 -0500
Subject: [PATCH 05/12] Avoid making duplicate copies in item inventory when
 no-mod texture is dragged onto faces.

---
 indra/newview/lltooldraganddrop.cpp | 18 ++++++++++++++++--
 indra/newview/llviewerobject.cpp    | 27 +++++++++++++++++++++++++++
 indra/newview/llviewerobject.h      |  7 +++++++
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 3cf07d8a3..3447341f6 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1035,7 +1035,14 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj,
 			}
 		}
 		// Add the texture item to the target object's inventory.
-		hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true);
+		if (LLAssetType::AT_TEXTURE == new_item->getType())
+		{
+			hit_obj->updateTextureInventory(new_item, TASK_INVENTORY_ITEM_KEY, true);
+		}
+		else
+		{
+			hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true);
+		}
  		// TODO: Check to see if adding the item was successful; if not, then
 		// we should return false here.
 	}
@@ -1050,7 +1057,14 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj,
 		// *FIX: may want to make sure agent can paint hit_obj.
 
 		// Add the texture item to the target object's inventory.
-		hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true);
+		if (LLAssetType::AT_TEXTURE == new_item->getType())
+		{
+			hit_obj->updateTextureInventory(new_item, TASK_INVENTORY_ITEM_KEY, true);
+		}
+		else
+		{
+			hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true);
+		}
 		// Force the object to update its refetch its inventory so it has this texture.
 		hit_obj->fetchInventoryFromServer();
  		// TODO: Check to see if adding the item was successful; if not, then
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index ff8edd698..191b0850d 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2984,6 +2984,33 @@ void LLViewerObject::removeInventory(const LLUUID& item_id)
 	//gBuildView->refresh();
 }
 
+bool LLViewerObject::isTextureInInventory(LLViewerInventoryItem* item)
+{
+	bool result = false;
+
+	if (item && LLAssetType::AT_TEXTURE == item->getType())
+	{
+		std::list<LLUUID>::iterator begin = mPendingInventoryItemsIDs.begin();
+		std::list<LLUUID>::iterator end = mPendingInventoryItemsIDs.end();
+
+		bool is_fetching = std::find(begin, end, item->getAssetUUID()) != end;
+		bool is_fetched = getInventoryItemByAsset(item->getAssetUUID()) != NULL;
+
+		result = is_fetched || is_fetching;
+	}
+
+	return result;
+}
+
+void LLViewerObject::updateTextureInventory(LLViewerInventoryItem* item, U8 key, bool is_new)
+{
+	if (item && !isTextureInInventory(item))
+	{
+		mPendingInventoryItemsIDs.push_back(item->getAssetUUID());
+		updateInventory(item, key, is_new);
+	}
+}
+
 void LLViewerObject::updateInventory(
 	LLViewerInventoryItem* item,
 	U8 key,
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index c2bfb674d..403b27490 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -444,12 +444,15 @@ public:
 	// manager until we have better iterators.
 	void updateInventory(LLViewerInventoryItem* item, U8 key, bool is_new);
 	void updateInventoryLocal(LLInventoryItem* item, U8 key); // Update without messaging.
+	void updateTextureInventory(LLViewerInventoryItem* item, U8 key, bool is_new);
 	LLInventoryObject* getInventoryObject(const LLUUID& item_id);
 	void getInventoryContents(LLInventoryObject::object_list_t& objects);
 	LLInventoryObject* getInventoryRoot();
 	LLViewerInventoryItem* getInventoryItemByAsset(const LLUUID& asset_id);
 	S16 getInventorySerial() const { return mInventorySerialNum; }
 
+	bool isTextureInInventory(LLViewerInventoryItem* item);
+
 	// These functions does viewer-side only object inventory modifications
 	void updateViewerInventoryAsset(
 		const LLViewerInventoryItem* item,
@@ -698,6 +701,10 @@ protected:
 	F32				mAppAngle;	// Apparent visual arc in degrees
 	F32				mPixelArea; // Apparent area in pixels
 
+	// IDs of of all items in the object's content which are added to the object's content,
+	// but not updated on the server yet. After item was updated, its ID will be removed from this list.
+	std::list<LLUUID> mPendingInventoryItemsIDs;
+
 	// This is the object's inventory from the viewer's perspective.
 	LLInventoryObject::object_list_t* mInventory;
 	class LLInventoryCallbackInfo

From d99de40b2bddc87a5c8a4fe7c6196fe2610133d2 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Fri, 13 Jul 2012 13:44:46 +0200
Subject: [PATCH 06/12] Suppress error prevalent on OSGrid

---
 indra/newview/llvoavatar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index c639fb330..5c4d540ea 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8504,7 +8504,7 @@ void LLVOAvatar::onBakedTextureMasksLoaded( BOOL success, LLViewerFetchedTexture
 		{
 			if (!aux_src->getData())
 			{
-				llerrs << "No auxiliary source data for onBakedTextureMasksLoaded" << llendl;
+				llwarns << "No auxiliary source data for onBakedTextureMasksLoaded" << llendl;
 				return;
 			}
 

From 9241816a71669368008d90d0ed1fb66c8a052305 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Sat, 14 Jul 2012 20:04:55 +0200
Subject: [PATCH 07/12] Include linden_common.h first. Needed for libcwd.

---
 indra/plugins/webkit/media_plugin_webkit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/plugins/webkit/media_plugin_webkit.cpp b/indra/plugins/webkit/media_plugin_webkit.cpp
index 64a81c267..95ebd6757 100644
--- a/indra/plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/plugins/webkit/media_plugin_webkit.cpp
@@ -25,8 +25,8 @@
  * $/LicenseInfo$
  * @endcond
  */
-#include "llqtwebkit.h"
 #include "linden_common.h"
+#include "llqtwebkit.h"
 #include "indra_constants.h" // for indra keyboard codes
 
 #include "lltimer.h"

From 66c95af0933953bcd2c6ea04c5b6e5682654d403 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Sat, 14 Jul 2012 20:57:55 +0200
Subject: [PATCH 08/12] Possible fix for "No able to connect to SecondLife"

---
 indra/llmessage/llcurl.cpp            | 3 +++
 indra/llmessage/llhttpclient.cpp      | 3 +++
 indra/llmessage/llurlrequest.cpp      | 3 +++
 indra/newview/hipporestrequest.cpp    | 3 +++
 indra/newview/llxmlrpctransaction.cpp | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 0f46d2810..20f68fae7 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -501,6 +501,9 @@ void LLCurl::Easy::prepRequest(const std::string& url,
 	if (post) setoptString(CURLOPT_ENCODING, "");
 
 	//setopt(CURLOPT_VERBOSE, 1); // useful for debugging
+#ifndef CURLTHREADING_BRANCH
+	setopt(CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
+#endif
 	setopt(CURLOPT_NOSIGNAL, 1);
 
 	// Set the CURL options for either Socks or HTTP proxy
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 037688906..797393de1 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -441,6 +441,9 @@ static LLSD blocking_request(
 	LLProxy::getInstance()->applyProxySettings(curlp);
 	
 	// * Set curl handle options
+#ifndef CURLTHREADING_BRANCH
+	curl_easy_setopt(curlp, CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
+#endif
 	curl_easy_setopt(curlp, CURLOPT_NOSIGNAL, 1);	// don't use SIGALRM for timeouts
 	curl_easy_setopt(curlp, CURLOPT_TIMEOUT, timeout);	// seconds, see warning at top of function.
 	curl_easy_setopt(curlp, CURLOPT_WRITEFUNCTION, LLHTTPBuffer::curl_write);
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index f5e08f393..6e470e0bc 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -471,6 +471,9 @@ void LLURLRequest::initialize()
 		return ;
 	}
 
+#ifndef CURLTHREADING_BRANCH
+	mDetail->mCurlRequest->setopt(CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
+#endif
 	mDetail->mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
 	mDetail->mCurlRequest->setWriteCallback(&downCallback, (void*)this);
 	mDetail->mCurlRequest->setReadCallback(&upCallback, (void*)this);
diff --git a/indra/newview/hipporestrequest.cpp b/indra/newview/hipporestrequest.cpp
index 7b64b35d8..85efee479 100644
--- a/indra/newview/hipporestrequest.cpp
+++ b/indra/newview/hipporestrequest.cpp
@@ -325,6 +325,9 @@ int HippoRestRequest::getBlocking(const std::string &url, std::string *result)
 	char curlErrorBuffer[CURL_ERROR_SIZE];
 	CURL* curlp = curl_easy_init();
 
+#ifndef CURLTHREADING_BRANCH
+	curl_easy_setopt(curlp, CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
+#endif
 	curl_easy_setopt(curlp, CURLOPT_NOSIGNAL, 1);	// don't use SIGALRM for timeouts
 	curl_easy_setopt(curlp, CURLOPT_TIMEOUT, 5);	// seconds
         curl_easy_setopt(curlp, CURLOPT_CAINFO, gDirUtilp->getCAFile().c_str());
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index af5e977b2..1642f8bc7 100644
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -240,6 +240,9 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
 	LLProxy::getInstance()->applyProxySettings(mCurlRequest);
 
 //	mCurlRequest->setopt(CURLOPT_VERBOSE, 1); // usefull for debugging
+#ifndef CURLTHREADING_BRANCH
+	mCurlRequest->setopt(CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
+#endif
 	mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
 	mCurlRequest->setWriteCallback(&curlDownloadCallback, (void*)this);
     	BOOL vefifySSLCert = !gSavedSettings.getBOOL("NoVerifySSLCert");

From c1c04b489ceed32acec7af0731a2427c087ce6e6 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sun, 15 Jul 2012 02:29:00 +0200
Subject: [PATCH 09/12] Revert "Possible fix for "No able to connect to
 SecondLife""

This reverts commit 66c95af0933953bcd2c6ea04c5b6e5682654d403.
---
 indra/llmessage/llcurl.cpp            | 3 ---
 indra/llmessage/llhttpclient.cpp      | 3 ---
 indra/llmessage/llurlrequest.cpp      | 3 ---
 indra/newview/hipporestrequest.cpp    | 3 ---
 indra/newview/llxmlrpctransaction.cpp | 3 ---
 5 files changed, 15 deletions(-)

diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 20f68fae7..0f46d2810 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -501,9 +501,6 @@ void LLCurl::Easy::prepRequest(const std::string& url,
 	if (post) setoptString(CURLOPT_ENCODING, "");
 
 	//setopt(CURLOPT_VERBOSE, 1); // useful for debugging
-#ifndef CURLTHREADING_BRANCH
-	setopt(CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
-#endif
 	setopt(CURLOPT_NOSIGNAL, 1);
 
 	// Set the CURL options for either Socks or HTTP proxy
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 797393de1..037688906 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -441,9 +441,6 @@ static LLSD blocking_request(
 	LLProxy::getInstance()->applyProxySettings(curlp);
 	
 	// * Set curl handle options
-#ifndef CURLTHREADING_BRANCH
-	curl_easy_setopt(curlp, CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
-#endif
 	curl_easy_setopt(curlp, CURLOPT_NOSIGNAL, 1);	// don't use SIGALRM for timeouts
 	curl_easy_setopt(curlp, CURLOPT_TIMEOUT, timeout);	// seconds, see warning at top of function.
 	curl_easy_setopt(curlp, CURLOPT_WRITEFUNCTION, LLHTTPBuffer::curl_write);
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index 6e470e0bc..f5e08f393 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -471,9 +471,6 @@ void LLURLRequest::initialize()
 		return ;
 	}
 
-#ifndef CURLTHREADING_BRANCH
-	mDetail->mCurlRequest->setopt(CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
-#endif
 	mDetail->mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
 	mDetail->mCurlRequest->setWriteCallback(&downCallback, (void*)this);
 	mDetail->mCurlRequest->setReadCallback(&upCallback, (void*)this);
diff --git a/indra/newview/hipporestrequest.cpp b/indra/newview/hipporestrequest.cpp
index 85efee479..7b64b35d8 100644
--- a/indra/newview/hipporestrequest.cpp
+++ b/indra/newview/hipporestrequest.cpp
@@ -325,9 +325,6 @@ int HippoRestRequest::getBlocking(const std::string &url, std::string *result)
 	char curlErrorBuffer[CURL_ERROR_SIZE];
 	CURL* curlp = curl_easy_init();
 
-#ifndef CURLTHREADING_BRANCH
-	curl_easy_setopt(curlp, CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
-#endif
 	curl_easy_setopt(curlp, CURLOPT_NOSIGNAL, 1);	// don't use SIGALRM for timeouts
 	curl_easy_setopt(curlp, CURLOPT_TIMEOUT, 5);	// seconds
         curl_easy_setopt(curlp, CURLOPT_CAINFO, gDirUtilp->getCAFile().c_str());
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index 1642f8bc7..af5e977b2 100644
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -240,9 +240,6 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
 	LLProxy::getInstance()->applyProxySettings(mCurlRequest);
 
 //	mCurlRequest->setopt(CURLOPT_VERBOSE, 1); // usefull for debugging
-#ifndef CURLTHREADING_BRANCH
-	mCurlRequest->setopt(CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
-#endif
 	mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
 	mCurlRequest->setWriteCallback(&curlDownloadCallback, (void*)this);
     	BOOL vefifySSLCert = !gSavedSettings.getBOOL("NoVerifySSLCert");

From 08ab36a5d92da619c355726b1e785b2028e1d776 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 14 Jul 2012 19:44:06 -0500
Subject: [PATCH 10/12] mPendingInventoryItemsIDs wasn't having entries
 removed.

---
 indra/newview/llviewerobject.cpp | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 191b0850d..54ed9ac8d 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2874,6 +2874,23 @@ void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code, LLExtS
 	   (object = gObjectList.findObject(ft->mTaskID)))
 	{
 		object->loadTaskInvFile(ft->mFilename);
+
+		LLInventoryObject::object_list_t::iterator it = object->mInventory->begin();
+		LLInventoryObject::object_list_t::iterator end = object->mInventory->end();
+		std::list<LLUUID>& pending_lst = object->mPendingInventoryItemsIDs;
+
+		for (; it != end && pending_lst.size(); ++it)
+		{
+			LLViewerInventoryItem* item = dynamic_cast<LLViewerInventoryItem*>(it->get());
+			if(item && item->getType() != LLAssetType::AT_CATEGORY)
+			{
+				std::list<LLUUID>::iterator id_it = std::find(pending_lst.begin(), pending_lst.begin(), item->getAssetUUID());
+				if (id_it != pending_lst.end())
+				{
+					pending_lst.erase(id_it);
+				}
+			}
+		}
 	}
 	else
 	{
@@ -4894,9 +4911,11 @@ void LLViewerObject::deleteParticleSource()
 // virtual
 void LLViewerObject::updateDrawable(BOOL force_damped)
 {
-	if (mDrawable.notNull() && 
-		!mDrawable->isState(LLDrawable::ON_MOVE_LIST) &&
-		isChanged(MOVED))
+	if (!isChanged(MOVED))
+	{ //most common case, having an empty if case here makes for better branch prediction
+	}
+	else if (mDrawable.notNull() && 
+		!mDrawable->isState(LLDrawable::ON_MOVE_LIST))
 	{
 		BOOL damped_motion = 
 			!isChanged(SHIFTED) &&										// not shifted between regions this frame and...

From fa9c366076755d82929adb4c30326ac1de68ee05 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 14 Jul 2012 19:45:11 -0500
Subject: [PATCH 11/12] Fixed alpha textures not entering the alpha pool an
 alternative way.

---
 indra/newview/lldrawable.cpp | 1 +
 indra/newview/llvovolume.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index cb57169a5..b9df32f06 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -802,6 +802,7 @@ void LLDrawable::updateTexture()
 			}
 		}*/
 				
+		getVOVolume()->mFaceMappingChanged = TRUE;
 		gPipeline.markRebuild(this, LLDrawable::REBUILD_MATERIAL, TRUE);
 	}
 }
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 1ae31e9b3..d6ff925cb 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1433,7 +1433,7 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
 		return TRUE; // No update to complete
 	}
 
-	if (mVolumeChanged || mFaceMappingChanged || mDrawable->isState(LLDrawable::REBUILD_MATERIAL))
+	if (mVolumeChanged || mFaceMappingChanged)
 	{
 		dirtySpatialGroup(drawable->isState(LLDrawable::IN_REBUILD_Q1));
 

From 08dd79fafdb1a9d2ae54a880699938bd998960aa Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 14 Jul 2012 20:42:47 -0500
Subject: [PATCH 12/12] Recent occlusion changes rearing their head again. Fix
 a crash when graphics set to low.

---
 indra/newview/llfeaturemanager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index b1e13d54e..1551744bd 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -556,6 +556,7 @@ void LLFeatureManager::setGraphicsLevel(S32 level, bool skipFeatures)
 
 	LLViewerShaderMgr::sSkipReload = false;
 	LLViewerShaderMgr::instance()->setShaders();
+	gPipeline.refreshCachedSettings();
 }
 
 void LLFeatureManager::applyBaseMasks()