Merged in lindenlab/viewer-bear

4 files changed, 50 insertions, 33 deletions

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 750e35a71a..b30bc1aed6 100755
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -348,6 +348,7 @@ void LLGLSLShader::unloadInternal()
         glGetAttachedObjectsARB(mProgramObject, sizeof(obj)/sizeof(obj[0]), &count, obj);
         for (GLsizei i = 0; i < count; i++)
         {
+            glDetachObjectARB(mProgramObject, obj[i]);
             glDeleteObjectARB(obj[i]);
         }
 
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 908f7125df..cada2d7cf2 100755
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -44,6 +44,7 @@
 #include "llmarketplacefunctions.h"
 #include "llwindow.h"
 #include "llviewercontrol.h"
+#include "llviewernetwork.h"
 #include "llpreview.h" 
 #include "llviewermessage.h"
 #include "llviewerfoldertype.h"
@@ -73,7 +74,8 @@ BOOL LLInventoryModel::sFirstTimeInViewer2 = TRUE;
 ///----------------------------------------------------------------------------
 
 //BOOL decompress_file(const char* src_filename, const char* dst_filename);
-static const char CACHE_FORMAT_STRING[] = "%s.inv"; 
+static const char PRODUCTION_CACHE_FORMAT_STRING[] = "%s.inv";
+static const char GRID_CACHE_FORMAT_STRING[] = "%s.%s.inv";
 static const char * const LOG_INV("Inventory");
 
 struct InventoryIDPtrLess
@@ -1623,6 +1625,29 @@ bool LLInventoryModel::fetchDescendentsOf(const LLUUID& folder_id) const
 	return cat->fetch();
 }
 
+//static
+std::string LLInventoryModel::getInvCacheAddres(const LLUUID& owner_id)
+{
+    std::string inventory_addr;
+    std::string owner_id_str;
+    owner_id.toString(owner_id_str);
+    std::string path(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, owner_id_str));
+    if (LLGridManager::getInstance()->isInProductionGrid())
+    {
+        inventory_addr = llformat(PRODUCTION_CACHE_FORMAT_STRING, path.c_str());
+    }
+    else
+    {
+        // NOTE: The inventory cache filenames now include the grid name.
+        // Add controls against directory traversal or problematic pathname lengths
+        // if your viewer uses grid names from an untrusted source.
+        const std::string& grid_id_str = LLGridManager::getInstance()->getGridId();
+        const std::string& grid_id_lower = utf8str_tolower(grid_id_str);
+        inventory_addr = llformat(GRID_CACHE_FORMAT_STRING, path.c_str(), grid_id_lower.c_str());
+    }
+    return inventory_addr;
+}
+
 void LLInventoryModel::cache(
 	const LLUUID& parent_folder_id,
 	const LLUUID& agent_id)
@@ -1643,11 +1668,7 @@ void LLInventoryModel::cache(
 		items,
 		INCLUDE_TRASH,
 		can_cache);
-	std::string agent_id_str;
-	std::string inventory_filename;
-	agent_id.toString(agent_id_str);
-	std::string path(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, agent_id_str));
-	inventory_filename = llformat(CACHE_FORMAT_STRING, path.c_str());
+	std::string inventory_filename = getInvCacheAddres(agent_id);
 	saveToFile(inventory_filename, categories, items);
 	std::string gzip_filename(inventory_filename);
 	gzip_filename.append(".gz");
@@ -1951,11 +1972,7 @@ bool LLInventoryModel::loadSkeleton(
 		item_array_t items;
 		item_array_t possible_broken_links;
 		cat_set_t invalid_categories; // Used to mark categories that weren't successfully loaded.
-		std::string owner_id_str;
-		owner_id.toString(owner_id_str);
-		std::string path(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, owner_id_str));
-		std::string inventory_filename;
-		inventory_filename = llformat(CACHE_FORMAT_STRING, path.c_str());
+		std::string inventory_filename = getInvCacheAddres(owner_id);
 		const S32 NO_VERSION = LLViewerInventoryCategory::VERSION_UNKNOWN;
 		std::string gzip_filename(inventory_filename);
 		gzip_filename.append(".gz");
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 86c6df3323..3004eaf7c1 100755
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -164,7 +164,9 @@ public:
 	bool loadSkeleton(const LLSD& options, const LLUUID& owner_id);
 	void buildParentChildMap(); // brute force method to rebuild the entire parent-child relations
 	void createCommonSystemCategories();
-	
+
+	static std::string getInvCacheAddres(const LLUUID& owner_id);
+
 	// Call on logout to save a terse representation.
 	void cache(const LLUUID& parent_folder_id, const LLUUID& agent_id);
 private:
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 263c73dc0e..6e677bbce5 100755
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -1080,28 +1080,25 @@ void LLPanelPermissions::setAllSaleInfo()
 
 	LLSaleInfo new_sale_info(sale_type, price);
 	LLSelectMgr::getInstance()->selectionSetObjectSaleInfo(new_sale_info);
-	
-	U8 old_click_action = 0;
-	LLSelectMgr::getInstance()->selectionGetClickAction(&old_click_action);
 
-	if (old_sale_info.isForSale()
-		&& !new_sale_info.isForSale()
-		&& old_click_action == CLICK_ACTION_BUY)
-	{
-		// If turned off for-sale, make sure click-action buy is turned
-		// off as well
-		LLSelectMgr::getInstance()->
-			selectionSetClickAction(CLICK_ACTION_TOUCH);
-	}
-	else if (new_sale_info.isForSale()
-		&& !old_sale_info.isForSale()
-		&& old_click_action == CLICK_ACTION_TOUCH)
-	{
-		// If just turning on for-sale, preemptively turn on one-click buy
-		// unless user have a different click action set
-		LLSelectMgr::getInstance()->
-			selectionSetClickAction(CLICK_ACTION_BUY);
-	}
+    struct f : public LLSelectedObjectFunctor
+    {
+        virtual bool apply(LLViewerObject* object)
+        {
+            return object->getClickAction() == CLICK_ACTION_BUY
+                || object->getClickAction() == CLICK_ACTION_TOUCH;
+        }
+    } check_actions;
+
+    // Selection should only contain objects that are of target
+    // action already or of action we are aiming to remove.
+    bool default_actions = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&check_actions);
+
+    if (default_actions && old_sale_info.isForSale() != new_sale_info.isForSale())
+    {
+        U8 new_click_action = new_sale_info.isForSale() ? CLICK_ACTION_BUY : CLICK_ACTION_TOUCH;
+        LLSelectMgr::getInstance()->selectionSetClickAction(new_click_action);
+    }
 }
 
 struct LLSelectionPayable : public LLSelectedObjectFunctor