From 26aa6ad7cc094971c674a2b213ff9b22553312a9 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 5 Apr 2014 22:02:32 +0200
Subject: [PATCH 1/6] Refactor LSL bridge to better work with OpenSim, provided
 by Cinder Roxley: * Don't flip UseLSLBridge setting when in OpenSim * Check
 for bridge existence before using it * Cut off the bridge creation process on
 OpenSim * Some other refactoring

---
 indra/newview/fslslbridge.cpp             | 46 +++++++++++++++--------
 indra/newview/fslslbridge.h               | 19 +++++-----
 indra/newview/fsradar.cpp                 |  2 +-
 indra/newview/llagent.cpp                 |  4 +-
 indra/newview/llappearancemgr.cpp         |  4 +-
 indra/newview/llassetuploadresponders.cpp |  2 +-
 indra/newview/llfloaterpreference.cpp     |  9 -----
 indra/newview/llstartup.cpp               |  9 -----
 indra/newview/llviewermenu.cpp            |  7 +---
 indra/newview/llviewermessage.cpp         |  5 +--
 10 files changed, 49 insertions(+), 58 deletions(-)

diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp
index bb7fa1c16d..d0c383dce6 100644
--- a/indra/newview/fslslbridge.cpp
+++ b/indra/newview/fslslbridge.cpp
@@ -60,6 +60,9 @@
 #include <fstream>
 #include <streambuf>
 
+#if OPENSIM
+#include "llviewernetwork.h"
+#endif
 
 const std::string FS_BRIDGE_FOLDER = "#LSL Bridge";
 const std::string FS_BRIDGE_CONTAINER_FOLDER = "Landscaping";
@@ -111,7 +114,7 @@ FSLSLBridge::~FSLSLBridge()
 {
 }
 
-bool FSLSLBridge::lslToViewer(std::string message, LLUUID fromID, LLUUID ownerID)
+bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID, const LLUUID& ownerID)
 {
 	if (!gSavedSettings.getBOOL("UseLSLBridge"))
 	{
@@ -275,9 +278,15 @@ bool FSLSLBridge::lslToViewer(std::string message, LLUUID fromID, LLUUID ownerID
 	return status;
 }
 
-bool FSLSLBridge::viewerToLSL(std::string message, FSLSLBridgeRequestResponder* responder)
+bool FSLSLBridge::canUseBridge()
 {
-	if (!gSavedSettings.getBOOL("UseLSLBridge"))
+	static LLCachedControl<bool> sUseLSLBridge(gSavedSettings, "UseLSLBridge");
+	return (isBridgeValid() && sUseLSLBridge);
+}
+
+bool FSLSLBridge::viewerToLSL(const std::string& message, FSLSLBridgeRequestResponder* responder)
+{
+	if (!canUseBridge())
 	{
 		return false;
 	}
@@ -291,7 +300,7 @@ bool FSLSLBridge::viewerToLSL(std::string message, FSLSLBridgeRequestResponder*
 	return true;
 }
 
-bool FSLSLBridge::updateBoolSettingValue(std::string msgVal)
+bool FSLSLBridge::updateBoolSettingValue(const std::string& msgVal)
 {
 	std::string boolVal = "0";
 
@@ -303,7 +312,7 @@ bool FSLSLBridge::updateBoolSettingValue(std::string msgVal)
 	return viewerToLSL(msgVal + "|" + boolVal, new FSLSLBridgeRequestResponder());
 }
 
-bool FSLSLBridge::updateBoolSettingValue(std::string msgVal, bool contentVal)
+bool FSLSLBridge::updateBoolSettingValue(const std::string& msgVal, bool contentVal)
 {
 	std::string boolVal = "0";
 
@@ -356,7 +365,7 @@ void FSLSLBridge::recreateBridge()
 		}
 	}
 	// clear the stored bridge ID - we are starting over.
-	mpBridge = 0; //the object itself will get cleaned up when new one is created.
+	mpBridge = NULL; //the object itself will get cleaned up when new one is created.
 
 	initCreationStep();
 }
@@ -438,6 +447,11 @@ void FSLSLBridge::startCreation()
 
 void FSLSLBridge::initCreationStep()
 {
+// Don't create on OpenSim. We need to fallback to another creation process there, unfortunately.
+// There is no way to ensure a rock object will ever be in a grid's Library.
+#if OPENSIM
+	if (LLGridManager::getInstance()->isInOpenSim()) return;
+#endif
 	mBridgeCreating = true;
 	//announce yourself
 	reportToNearbyChat(LLTrans::getString("fsbridge_creating"));
@@ -715,7 +729,7 @@ void FSLSLBridge::setupBridgePrim(LLViewerObject* object)
 	object->setVolume(LLVolumeParams(profParams, pathParams), 0);
 
 	object->setScale(LLVector3(10.0f, 10.0f, 10.0f), TRUE);
-	for (int i = 0; i < object->getNumTEs(); i++)
+	for (S32 i = 0; i < object->getNumTEs(); i++)
 	{
 		LLViewerTexture* image = LLViewerTextureManager::getFetchedTexture( IMG_INVISIBLE );
 		object->setTEImage(i, image); //transparent texture
@@ -904,8 +918,8 @@ void FSLSLBridgeScriptCallback::fire(const LLUUID& inv_item)
 
 std::string FSLSLBridgeScriptCallback::prepUploadFile()
 {
-	std::string fName = gDirUtilp->getExpandedFilename(LL_PATH_FS_RESOURCES, UPLOAD_SCRIPT_CURRENT);
-	std::string fNew = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,UPLOAD_SCRIPT_CURRENT);
+	const std::string fName = gDirUtilp->getExpandedFilename(LL_PATH_FS_RESOURCES, UPLOAD_SCRIPT_CURRENT);
+	const std::string fNew = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,UPLOAD_SCRIPT_CURRENT);
 
 	LLFILE* fpIn = LLFile::fopen(fName, "rt");
 	if (!fpIn)
@@ -928,7 +942,7 @@ std::string FSLSLBridgeScriptCallback::prepUploadFile()
 
 	std::string bridgeScript( (char const*)&vctData[0] );
 
-	std::string bridgekey = "BRIDGEKEY";
+	const std::string bridgekey = "BRIDGEKEY";
 	bridgeScript.replace(bridgeScript.find(bridgekey), bridgekey.length(), FSLSLBridge::getInstance()->findFSCategory().asString());
 
 	LLFILE *fpOut = LLFile::fopen(fNew, "wt");
@@ -947,9 +961,9 @@ std::string FSLSLBridgeScriptCallback::prepUploadFile()
 	return fNew;
 }
 
-void FSLSLBridge :: checkBridgeScriptName(std::string fileName)
+void FSLSLBridge::checkBridgeScriptName(const std::string& fileName)
 {
-	if ((fileName.length() == 0) || !mBridgeCreating)
+	if ((fileName.empty()) || !mBridgeCreating)
 	{
 		LL_WARNS("FSLSLBridge") << "Bridge script length was zero, or bridge was not marked as under creation. Aborting." << LL_ENDL; 
 		return;
@@ -963,7 +977,7 @@ void FSLSLBridge :: checkBridgeScriptName(std::string fileName)
 	}
 
 	//need to parse out the last length of a GUID and compare to saved possible names.
-	std::string fileOnly = fileName.substr(fileName.length() - UPLOAD_SCRIPT_CURRENT.length(), UPLOAD_SCRIPT_CURRENT.length());
+	const std::string fileOnly = fileName.substr(fileName.length() - UPLOAD_SCRIPT_CURRENT.length(), UPLOAD_SCRIPT_CURRENT.length());
 
 	if (fileOnly == UPLOAD_SCRIPT_CURRENT)
 	{
@@ -1022,7 +1036,7 @@ void FSLSLBridge::finishBridge()
 //
 // Helper functions
 ///
-bool FSLSLBridge::isItemAttached(LLUUID iID)
+bool FSLSLBridge::isItemAttached(const LLUUID& iID)
 {
 	return (isAgentAvatarValid() && gAgentAvatarp->isWearingAttachment(iID));
 }
@@ -1122,7 +1136,7 @@ LLUUID FSLSLBridge::findFSBridgeContainerCategory()
 	return LLUUID();
 }
 
-LLViewerInventoryItem* FSLSLBridge::findInvObject(std::string obj_name, LLUUID catID, LLAssetType::EType type)
+LLViewerInventoryItem* FSLSLBridge::findInvObject(const std::string& obj_name, const LLUUID& catID, LLAssetType::EType type)
 {
 	LLViewerInventoryCategory::cat_array_t cats;
 	LLViewerInventoryItem::item_array_t items;
@@ -1151,7 +1165,7 @@ LLViewerInventoryItem* FSLSLBridge::findInvObject(std::string obj_name, LLUUID c
 	return NULL;
 }
 
-void FSLSLBridge::cleanUpBridgeFolder(std::string nameToCleanUp)
+void FSLSLBridge::cleanUpBridgeFolder(const std::string& nameToCleanUp)
 {
 	LL_INFOS("FSLSLBridge") << "Cleaning leftover scripts and bridges for folder " << nameToCleanUp << LL_ENDL;
 	
diff --git a/indra/newview/fslslbridge.h b/indra/newview/fslslbridge.h
index ad6829fa91..8779ce7818 100644
--- a/indra/newview/fslslbridge.h
+++ b/indra/newview/fslslbridge.h
@@ -58,11 +58,11 @@ public:
 	FSLSLBridge();
 	~FSLSLBridge();
 
-	bool lslToViewer(std::string message, LLUUID fromID, LLUUID ownerID);
-	bool viewerToLSL(std::string message, FSLSLBridgeRequestResponder* responder = NULL);
+	bool lslToViewer(const std::string& message, const LLUUID& fromID, const LLUUID& ownerID);
+	bool viewerToLSL(const std::string& message, FSLSLBridgeRequestResponder* responder = NULL);
 
-	bool updateBoolSettingValue(std::string msgVal);
-	bool updateBoolSettingValue(std::string msgVal, bool contentVal);
+	bool updateBoolSettingValue(const std::string& msgVal);
+	bool updateBoolSettingValue(const std::string& msgVal, bool contentVal);
 	
 	void initBridge();
 	void recreateBridge();
@@ -74,9 +74,9 @@ public:
 
 	void setBridge(LLViewerInventoryItem* item) { mpBridge = item; };
 	LLViewerInventoryItem* getBridge() { return mpBridge; };
-	bool isBridgeValid() const { return NULL != mpBridge; }
+	bool canUseBridge();
 
-	void checkBridgeScriptName(std::string fileName);
+	void checkBridgeScriptName(const std::string& fileName);
 	std::string currentFullName() { return mCurrentFullName; }
 
 	LLUUID getBridgeFolder() { return mBridgeFolderID; }
@@ -100,18 +100,19 @@ private:
 	LLUUID					mBridgeUUID;
 
 	bool					mIsFirstCallDone; //initialization conversation
+	bool isBridgeValid() const { return NULL != mpBridge; }
 
 protected:
-	LLViewerInventoryItem* findInvObject(std::string obj_name, LLUUID catID, LLAssetType::EType type);
+	LLViewerInventoryItem* findInvObject(const std::string& obj_name, const LLUUID& catID, LLAssetType::EType type);
 	LLUUID findFSCategory();
 	LLUUID findFSBridgeContainerCategory();
 
-	bool isItemAttached(LLUUID iID);
+	bool isItemAttached(const LLUUID& iID);
 	void createNewBridge();
 	void create_script_inner(LLViewerObject* object);
 	bool isOldBridgeVersion(LLInventoryItem* item);
 	void cleanUpBridgeFolder();
-	void cleanUpBridgeFolder(std::string nameToCleanUp);
+	void cleanUpBridgeFolder(const std::string& nameToCleanUp);
 	void setupBridgePrim(LLViewerObject* object);
 	void initCreationStep();
 	void cleanUpBridge();
diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp
index 4bc3c25991..774a913826 100644
--- a/indra/newview/fsradar.cpp
+++ b/indra/newview/fsradar.cpp
@@ -169,10 +169,10 @@ void FSRadar::updateRadarList()
 	static LLCachedControl<bool> RadarLeaveChannelAlert(gSavedSettings, "RadarLeaveChannelAlert");
 	static LLCachedControl<F32> nearMeRange(gSavedSettings, "NearMeRange");
 	static LLCachedControl<bool> limitRange(gSavedSettings, "LimitRadarByRange");
-	static LLCachedControl<bool> sUseLSLBridge(gSavedSettings, "UseLSLBridge");
 	static LLCachedControl<F32> RenderFarClip(gSavedSettings, "RenderFarClip");
 	static LLCachedControl<bool> sFSLegacyRadarFriendColoring(gSavedSettings, "FSLegacyRadarFriendColoring");
 	static LLCachedControl<bool> sRadarColorNamesByDistance(gSavedSettings, "FSRadarColorNamesByDistance", false);
+	bool sUseLSLBridge = FSLSLBridge::instance().canUseBridge();
 
 	F32 drawRadius(RenderFarClip);
 	const LLVector3d& posSelf = gAgent.getPositionGlobal();
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index e078d8dbe2..e80f1aa7c9 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -4731,7 +4731,7 @@ void LLAgent::doTeleportViaLocation(const LLVector3d& pos_global)
 		sendReliableMessage();
 	}
 // <FS:TT> Client LSL Bridge
-	if (gSavedSettings.getBOOL("UseLSLBridge") && isLocal)
+	if (FSLSLBridge::instance().canUseBridge() && isLocal)
 	{
 		teleportBridgeGlobal(pos_global);
 	}
@@ -4771,7 +4771,7 @@ void LLAgent::doTeleportViaLocationLookAt(const LLVector3d& pos_global)
 	teleportRequest(region_handle, pos_local, getTeleportKeepsLookAt());
 
 // <FS:TT> Client LSL Bridge
-	if (gSavedSettings.getBOOL("UseLSLBridge"))
+	if (FSLSLBridge::instance().canUseBridge())
 	{
 		if (region_handle == to_region_handle(getPositionGlobal()))
 		{
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index cf6f409744..d0ae14b098 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1493,7 +1493,7 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id)
 	gInventory.collectDescendentsIf(cat_id, cats, items, FALSE, collector);
 
 // <FS:TT> Client LSL Bridge
-	if (gSavedSettings.getBOOL("UseLSLBridge"))
+	if (FSLSLBridge::instance().canUseBridge())
 	{
 		//if replacing - make sure bridge stays.
 		if (FSLSLBridge::instance().getBridge())
@@ -2034,7 +2034,7 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new,
 	obj_items.insert(obj_items.end(), obj_items_new.begin(), obj_items_new.end());
 // [/RLVa:KB]
 //-TT Client LSL Bridge
-	if (gSavedSettings.getBOOL("UseLSLBridge"))
+	if (FSLSLBridge::instance().canUseBridge())
 	{
 		//if replacing - make sure bridge stays.
 		if (!append && FSLSLBridge::instance().getBridge())
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index 154284eb6f..14433e5bad 100755
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -610,7 +610,7 @@ void LLUpdateAgentInventoryResponder::uploadComplete(const LLSD& content)
 			  }
 		  }
 		// <FS:TT> Client LSL Bridge
-		if (gSavedSettings.getBOOL("UseLSLBridge"))
+		if (FSLSLBridge::instance().canUseBridge())
 		{
 			FSLSLBridge::instance().checkBridgeScriptName(mFileName);
 		}
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 0137d50032..37be33e564 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -2689,15 +2689,6 @@ BOOL LLPanelPreference::postBuild()
 	}
 	// </FS:Ansariel>
 
-#ifdef OPENSIM // <FS:AW optional opensim support/>
-// <FS:AW Disable LSL bridge on opensim>
-	if(LLGridManager::getInstance()->isInOpenSim() && !LLGridManager::getInstance()->isInAuroraSim() && hasChild("UseLSLBridge", TRUE))
-	{
- 		getChild<LLCheckBoxCtrl>("UseLSLBridge")->setEnabled(FALSE);
-	}
-// </FS:AW Disable LSL bridge on opensim>
-#endif // OPENSIM // <FS:AW optional opensim support/>
-
 	apply();
 	return true;
 }
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 70cc2c143b..7ebd3502ad 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2579,15 +2579,6 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x,
 		set_startup_status(1.0, "", "");
 		display_startup();
 
-// <FS:AW Disable LSL bridge on opensim>
-#ifdef OPENSIM // <FS:AW optional opensim support/>
-		if (LLGridManager::getInstance()->isInOpenSim()  && !LLGridManager::getInstance()->isInAuroraSim())
-		{
-			gSavedSettings.setBOOL("UseLSLBridge", FALSE);
-		}
-#endif // OPENSIM // <FS:AW optional opensim support/>
-// </FS:AW Disable LSL bridge on opensim>
-
 		// <FS:TT> Client LSL Bridge
 		if (gSavedSettings.getBOOL("UseLSLBridge"))
 		{
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 356fabc393..d3ed8fe9a9 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4295,12 +4295,7 @@ class FSSelfCheckMoveLock : public view_listener_t
 
 bool enable_bridge_function()
 {
-#ifdef OPENSIM
-	if (LLGridManager::getInstance()->isInOpenSim() && !LLGridManager::getInstance()->isInAuroraSim())
-		// No bridge on OpenSim yet.
-		return false;
-#endif // OPENSIM
-	return (gSavedSettings.getBOOL("UseLSLBridge") && FSLSLBridge::instance().isBridgeValid());
+	return FSLSLBridge::instance().canUseBridge();
 }
 
 bool enable_move_lock()
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index e63b341f04..276f5dd4bf 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4426,8 +4426,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 			case CHAT_TYPE_OWNER:
 				// <FS:TT> Client LSL Bridge
 				{
-					static LLCachedControl<bool> sUseLSLBridge(gSavedSettings, "UseLSLBridge");
-					if (sUseLSLBridge && FSLSLBridge::instance().lslToViewer(mesg, from_id, owner_id))
+					if (FSLSLBridge::instance().lslToViewer(mesg, from_id, owner_id))
 					{
 						return;
 					}
@@ -8367,7 +8366,7 @@ void process_teleport_failed(LLMessageSystem *msg, void**)
 	gAgent.stopTyping();
 
 	llinfos << "Teleport error, reason=" << reason << llendl;
-	if ((!gSavedSettings.getBOOL("UseLSLBridge")) ||
+	if (!FSLSLBridge::instance().canUseBridge() ||
 		(reason != "Could not teleport closer to destination"))
 	{
 		LLNotificationsUtil::add("CouldNotTeleportReason", args);

From e9b2f0092dbf0555a49e5c2c787a6da42c0e39f9 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 5 Apr 2014 22:12:56 +0200
Subject: [PATCH 2/6] Don't detach LSL bridge when taking off all avatar
 attachments

---
 indra/newview/llappearancemgr.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index d0ae14b098..ed862939d0 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -3893,6 +3893,12 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove)
 		{
 			continue;
 		}
+		// <FS:Ansariel> LSL Bridge
+		if (FSLSLBridge::instance().canUseBridge() && linked_item == FSLSLBridge::instance().getBridge())
+		{
+			continue;
+		}
+		// </FS:Ansariel>
 
 		fUpdateAppearance = true;
 		const LLUUID& linked_item_id = gInventory.getLinkedItemID(*it);

From 0c2c71cc7a7e5a49e7741c4fbb15b8c5949dff9b Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sat, 5 Apr 2014 23:30:23 +0200
Subject: [PATCH 3/6] Updated Polish translation

---
 .../default/xui/pl/floater_preferences.xml     |  2 +-
 .../skins/default/xui/pl/notifications.xml     |  5 ++++-
 .../xui/pl/panel_preferences_privacy.xml       |  2 +-
 .../default/xui/pl/panel_preferences_setup.xml | 18 ++++++++++++------
 indra/newview/skins/default/xui/pl/strings.xml |  3 +++
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/floater_preferences.xml b/indra/newview/skins/default/xui/pl/floater_preferences.xml
index b9cfb316a4..35e804089f 100755
--- a/indra/newview/skins/default/xui/pl/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preferences.xml
@@ -12,7 +12,7 @@
 		<panel label="Kolory" name="colors"/>
 		<panel label="Grafika" name="display"/>
 		<panel label="Dźwięk i media" name="audio"/>
-		<panel label="Sieć i cache" name="input"/>
+		<panel label="Sieć i bufory" name="input"/>
 		<panel label="Ruch i widok" name="move"/>
 		<panel label="Powiadomienia" name="msgs"/>
 		<panel label="Prywatność" name="im"/>
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index ec03520e04..56b8c6f7bb 100755
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -390,6 +390,9 @@ Czy na pewno chcesz kontynuować?
 		Bufor danych zostanie przeniesiony po restarcie aplikacji [APP_NAME].
 Pamiętaj: Opcja ta wyczyszcza bufor danych.
 	</notification>
+	<notification name="SoundCacheWillBeMoved">
+		Bufor dźwięków zostanie przeniesiony po restarcie aplikacji [APP_NAME].
+	</notification>
 	<notification name="ChangeConnectionPort">
 		Ustawienia portu zostają zaktualizowane po restarcie aplikacji [APP_NAME].
 	</notification>
@@ -3739,7 +3742,7 @@ Obecne ustawienie: [CURRENT_VALUE]
 		Nie można śledzić tego awatara, ponieważ jest poza zasięgiem radaru.
 	</notification>
 	<notification name="CacheEmpty">
-		Pamięć podręczna Twojej Przeglądarki jest pusta. Miej na uwadze, że możesz przez jakiś czas odczuwać obniżoną wydajność i spowolnione doczytywanie obiektów z Szafy.
+		Pamięć podręczna (bufor danych) Twojej Przeglądarki jest pusta. Miej na uwadze, że możesz przez jakiś czas odczuwać obniżoną wydajność i spowolnione doczytywanie obiektów z Szafy.
 	</notification>
 	<notification name="FirstJoinSupportGroup">
 		Witaj w grupie wsparcia Phoenix/Firestorm!
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
index ef9267b47f..e9423a2b34 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
@@ -5,7 +5,7 @@
 			<panel.string name="log_in_to_change">
 				Zaloguj się, by zmienić
 			</panel.string>
-			<button label="Wyczyść historię" tool_tip="Wyczyść zapisane obrazy, ostatnią lokalizację, historię teleportów, bufor stron internetowych i cache tekstur" name="clear_cache"/>
+			<button label="Wyczyść historię" tool_tip="Wyczyść zapisane obrazy, ostatnią lokalizację, historię teleportów, bufor stron internetowych i bufor danych tekstur" name="clear_cache"/>
 			<text name="cache_size_label">
 				(miejsca, obrazy, strony web, historia wyszukiwarki)
 			</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
index 85901f080b..11d250f55d 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Sieć/cache" name="Input panel">
+<panel label="Sieć i bufory" name="Input panel">
 	<layout_stack name="max_bandwidth_layout">
 		<layout_panel name="bandwidth_panel">
 			<text name="Maximum bandwidth">
@@ -15,16 +15,23 @@
 			<check_box label="Własny port" name="connection_port_enabled"/>
 			<spinner label="Numer portu:" name="connection_port"/>
 			<text name="cache_size_label_l">
-				Rozmiar cache
+				Rozmiar pamięci podr.
 			</text>
-			<button label="Wyczyść cache Szafy" name="ClearInventoryCache"/>
+			<button label="Wyczyść bufor Szafy" name="ClearInventoryCache"/>
 			<text name="Cache location">
-				Położenie cache:
+				Położenie głównego buforu pamięci podr. (cache):
 			</text>
 			<button label="Pokaż" label_selected="Pokaż" name="open_cache"/>
 			<button label="Ustaw" label_selected="Ustaw" name="set_cache"/>
 			<button label="Resetuj" label_selected="Resetuj" name="reset_cache"/>
 			<button label="Wyczyść" label_selected="Wyczyść" name="clear_cache"/>
+			<text name="Sound Cache location">
+				Położenie buforu pamięci podręcznej dźwięków:
+			</text>
+			<button label="Pokaż" label_selected="Pokaż" name="open_sound_cache"/>
+			<button label="Ustaw" label_selected="Ustaw" name="set_sound_cache"/>
+			<button label="Resetuj" label_selected="Resetuj" name="reset_sound_cache"/>
+			<check_box label="Nie usuwaj wypakowanych plików DSF (dźwięków) z buforu podczas wylogowywania" tool_tip="Gdy zaznaczysz tą opcję, to przeglądarka nie będzie usuwać wypakowanych plików dźwiękowych z pamięci podręcznej podczas wylogowywania, co może poprawić wydajność podczas odtwarzania ich w świecie. Pamiętaj proszę, że włączenie tej opcji spowoduje bardzo szybkie zapełnienie się katalogu pamięci podręcznej, a także że nie obowiązuje w jej wypadku ustawienie maksymalnego jej limitu. Może to doprowadzić do wykorzystywania powierzchni dyskowej ponad miarę. Ta opcja jest domyślnie wyłączona." name="keep_unpacked_cache"/>
 			<text name="log_path_desc">
 				Położenie dzienników i logów czatów:
 			</text>
@@ -33,7 +40,6 @@
 			<button label="Resetuj" label_selected="Resetuj" name="reset_logpath"/>
 			<button label="Logi błędów" label_selected="Logi błędów" name="browse_crashlogs"/>
 			<button label="Folder ustawień" label_selected="Folder ustawień" name="browse_settingsdir"/>
-			<check_box label="Nie usuwaj wypakowanych plików DSF (dźwięków) z cache podczas wylogowywania" tool_tip="Gdy zaznaczysz tą opcję, to przeglądarka nie będzie usuwać wypakowanych plików dźwiękowych z pamięci podręcznej podczas wylogowywania, co może poprawić wydajność podczas odtwarzania ich w świecie. Pamiętaj proszę, że włączenie tej opcji spowoduje bardzo szybkie zapełnienie się katalogu pamięci podręcznej, a także że nie obowiązuje w jej wypadku ustawienie maksymalnego jej limitu. Może to doprowadzić do wykorzystywania powierzchni dyskowej ponad miarę. Ta opcja jest domyślnie wyłączona." name="keep_unpacked_cache"/>
 			<text name="Web:">
 				Przeglądarka internetowa:
 			</text>
@@ -54,7 +60,7 @@
 			<check_box label="Akceptuj ciasteczka" name="cookies_enabled"/>
 			<check_box label="Włącz Javascript" name="browser_javascript_enabled"/>
 			<check_box label="Włącz wyskakujące okienka przeglądarki mediów" name="media_popup_enabled"/>
-			<text name="Proxy Settings:">
+			<text name="Proxy Settings:" width="95">
 				Ustawienia proxy:
 			</text>
 			<button label="Dostosuj ustawienia" label_selected="Przeglądaj" name="set_proxy"/>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 362312828c..0f684de834 100755
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -12,6 +12,9 @@
 	<string name="StartupClearingCache">
 		Czyszczenie bufora danych...
 	</string>
+	<string name="StartupClearingTextureCache">
+		Czyszczenie bufora tekstur...
+	</string>
 	<string name="StartupInitializingTextureCache">
 		Inicjowanie bufora danych tekstur...
 	</string>

From 3ca2f34019195be1b82e8f6139e5a3389b76950c Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 6 Apr 2014 11:29:06 +0200
Subject: [PATCH 4/6] Some media filter code cleanup from Cinder Roxley

---
 indra/newview/floatermedialists.cpp   | 16 ++++++-------
 indra/newview/llviewerparcelmedia.cpp | 33 ++++++++++++---------------
 indra/newview/llviewerparcelmedia.h   |  4 ++--
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/indra/newview/floatermedialists.cpp b/indra/newview/floatermedialists.cpp
index 903a325fbf..8730e30283 100644
--- a/indra/newview/floatermedialists.cpp
+++ b/indra/newview/floatermedialists.cpp
@@ -47,23 +47,21 @@ BOOL FloaterMediaLists::postBuild()
 	childSetAction("remove_whitelist", boost::bind(&FloaterMediaLists::onWhitelistRemove, this));
 	childSetAction("add_blacklist", boost::bind(&FloaterMediaLists::onBlacklistAdd, this));
 	childSetAction("remove_blacklist", boost::bind(&FloaterMediaLists::onBlacklistRemove, this));
-
-	if (!mWhitelistSLC || !mBlacklistSLC)
-	{
-		return TRUE;
-	}
 	
-	for(S32 i = 0;i<(S32)LLViewerParcelMedia::sMediaFilterList.size();i++)
+	for (LLSD::array_iterator p_itr = LLViewerParcelMedia::sMediaFilterList.beginArray();
+		 p_itr != LLViewerParcelMedia::sMediaFilterList.endArray();
+		 ++p_itr)
 	{
+		LLSD itr = (*p_itr);
 		LLSD element;
 		element["columns"][0]["column"] = "list";
-		element["columns"][0]["value"] = LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString();
-		if (LLViewerParcelMedia::sMediaFilterList[i]["action"].asString() == "allow")
+		element["columns"][0]["value"] = itr["domain"].asString();
+		if (itr["action"].asString() == "allow")
 		{	
 			mWhitelistSLC->addElement(element);
 			mWhitelistSLC->sortByColumn("list", TRUE);
 		}
-		else if (LLViewerParcelMedia::sMediaFilterList[i]["action"].asString() == "deny")
+		else if (itr["action"].asString() == "deny")
 		{
 			mBlacklistSLC->addElement(element);
 			mBlacklistSLC->sortByColumn("list", TRUE);
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index da773f9274..570d13e17b 100755
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -1939,38 +1939,33 @@ void callback_MOAP_alert2(const LLSD &notification, const LLSD &response, LLMedi
 	}
 }
 
-bool LLViewerParcelMedia::saveDomainFilterList()
+void LLViewerParcelMedia::saveDomainFilterList()
 {
-	std::string medialist_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "medialist.xml");
+	const std::string medialist_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "medialist.xml");
 
-	llofstream medialistFile(medialist_filename);
-	LLSDSerialize::toPrettyXML(sMediaFilterList, medialistFile);
-	medialistFile.close();
-	return true;
+	llofstream medialist;
+	medialist.open(medialist_filename);
+	LLSDSerialize::toPrettyXML(sMediaFilterList, medialist);
+	medialist.close();
 }
 
-bool LLViewerParcelMedia::loadDomainFilterList()
+void LLViewerParcelMedia::loadDomainFilterList()
 {
-	std::string medialist_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "medialist.xml");
+	const std::string medialist_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "medialist.xml");
 
-	if(!LLFile::isfile(medialist_filename))
-	{
-		LLSD emptyllsd;
-		llofstream medialistFile(medialist_filename);
-		LLSDSerialize::toPrettyXML(emptyllsd, medialistFile);
-		medialistFile.close();
-	}
-
-	if(LLFile::isfile(medialist_filename))
+	if (LLFile::isfile(medialist_filename))
 	{
 		llifstream medialistFile(medialist_filename);
 		LLSDSerialize::fromXML(sMediaFilterList, medialistFile);
 		medialistFile.close();
-		return true;
 	}
 	else
 	{
-		return false;
+		LLSD emptyllsd;
+		llofstream medialist;
+		medialist.open(medialist_filename);
+		LLSDSerialize::toPrettyXML(emptyllsd, medialist);
+		medialist.close();
 	}
 }
 
diff --git a/indra/newview/llviewerparcelmedia.h b/indra/newview/llviewerparcelmedia.h
index f5f0087061..aa6eaec4f4 100755
--- a/indra/newview/llviewerparcelmedia.h
+++ b/indra/newview/llviewerparcelmedia.h
@@ -59,8 +59,8 @@ class LLViewerParcelMedia : public LLViewerMediaObserver
 			// user has media filter enabled and play requested
 		static std::string extractDomain(std::string url);
 			// helper function to extract domain from url and conve
-		static bool loadDomainFilterList();
-		static bool saveDomainFilterList();
+		static void loadDomainFilterList();
+		static void saveDomainFilterList();
 
 		static void stop();
 			// user clicked stop button in media transport controls

From e73d6e7f024b204ef6f538dc1be16ae7fb1efaeb Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 6 Apr 2014 13:31:07 +0200
Subject: [PATCH 5/6] FIRE-2107: Added button to clear internal web browser
 cache to "Network & Cache" preferences panel

---
 indra/newview/llfloaterpreference.cpp         | 27 +++++++++++++++++++
 indra/newview/llfloaterpreference.h           |  2 ++
 .../skins/default/xui/de/notifications.xml    |  4 +++
 .../xui/de/panel_preferences_setup.xml        |  1 +
 .../skins/default/xui/en/notifications.xml    | 12 +++++++++
 .../xui/en/panel_preferences_setup.xml        | 16 ++++++++++-
 6 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 37be33e564..1a6a62c368 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -257,6 +257,20 @@ bool callback_clear_inventory_cache(const LLSD& notification, const LLSD& respon
 }
 // </FS:Ansariel>
 
+// <FS:Ansariel> Clear inventory cache button
+bool callback_clear_web_browser_cache(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+	if ( option == 0 ) // YES
+	{
+		LLViewerMedia::clearAllCaches();
+		LLViewerMedia::clearAllCookies();
+	}
+
+	return false;
+}
+// </FS:Ansariel>
+
 bool callback_clear_cache(const LLSD& notification, const LLSD& response)
 {
 	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
@@ -450,6 +464,9 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	// <FS:Ansariel> Clear inventory cache button
 	mCommitCallbackRegistrar.add("Pref.InvClearCache",			boost::bind(&LLFloaterPreference::onClickInventoryClearCache, this));
 	// </FS:Ansariel>
+	// <FS:Ansariel> Clear web browser cache button
+	mCommitCallbackRegistrar.add("Pref.WebBrowserClearCache",		boost::bind(&LLFloaterPreference::onClickWebBrowserClearCache, this));
+	// </FS:Ansariel>
 	mCommitCallbackRegistrar.add("Pref.SetCache",				boost::bind(&LLFloaterPreference::onClickSetCache, this));
 	mCommitCallbackRegistrar.add("Pref.ResetCache",				boost::bind(&LLFloaterPreference::onClickResetCache, this));
 //	mCommitCallbackRegistrar.add("Pref.ClickSkin",				boost::bind(&LLFloaterPreference::onClickSkin, this,_1, _2));
@@ -1210,6 +1227,13 @@ void LLFloaterPreference::onClickInventoryClearCache()
 }
 // </FS:Ansariel>
 
+// <FS:Ansariel> Clear web browser cache button
+void LLFloaterPreference::onClickWebBrowserClearCache()
+{
+	LLNotificationsUtil::add("ConfirmClearWebBrowserCache", LLSD(), LLSD(), callback_clear_web_browser_cache);
+}
+// </FS:Ansariel>
+
 // Called when user changes language via the combobox.
 void LLFloaterPreference::onLanguageChange()
 {
@@ -2227,6 +2251,9 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im
 
 	// <FS:Ansariel> Clear inventory cache button
 	getChildView("ClearInventoryCache")->setEnabled(TRUE);
+
+	// <FS:Ansariel> Clear web browser cache button
+	getChildView("ClearWebBrowserCache")->setEnabled(TRUE);
 }
 
 void LLFloaterPreference::refreshUI()
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index a9ab82d635..3c55ec11d1 100755
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -204,6 +204,8 @@ public:
 	//void callback_clear_settings(const LLSD& notification, const LLSD& response);
 	// <FS:Ansariel> Clear inventory cache button
 	void onClickInventoryClearCache();
+	// <FS:Ansariel> Clear web browser cache button
+	void onClickWebBrowserClearCache();
 	
 	void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box);
 	void refreshUI();
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 7b3591046e..d7839d3d32 100755
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -2293,6 +2293,10 @@ Möchten Sie den Nicht-stören-Modus deaktivieren, bevor Sie diese Transaktion a
 		Möchten Sie Ihren Inventar-Cache wirklich leeren?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmClearWebBrowserCache">
+		Möchten Sie Ihren Webbrowser-Cache wirklich leeren?
+		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmClearCookies">
 		Sind Sie sicher, dass Sie Ihre Cookies löschen möchten?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Ja"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
index 64d1c3eaf1..eb48297a03 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -69,6 +69,7 @@
         <combo_box.item label="Fünf Fenster" name="web_5"/>
         <combo_box.item label="Zehn Fenster" name="web_10"/>
     </combo_box>
+	<button label="Webbrowser-Cache löschen" name="ClearWebBrowserCache" width="160"/>
 	<check_box initial_value="true" label="Plugins aktivieren" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Cookies annehmen" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Javascript aktivieren" name="browser_javascript_enabled"/>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index bd038ee294..49f1e01c92 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5662,6 +5662,18 @@ Are you sure you want to clear your inventory cache?
      notext="Cancel"
      yestext="OK"/>
   </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmClearWebBrowserCache"
+   type="alertmodal">
+Are you sure you want to clear your web browser cache?
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 2cf0eed88f..8b7e09db00 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -524,6 +524,20 @@
          value="10" />
     </combo_box>
 
+    <button
+     enabled="false"
+     follows="right|top"
+     height="23"
+     label="Clear Browser Cache"
+     layout="topleft"
+     right="-10"
+     name="ClearWebBrowserCache"
+     top_delta="0"
+     width="140">
+        <button.commit_callback
+         function="Pref.WebBrowserClearCache" />
+    </button>
+
     <check_box
      enabled="true"
      follows="left|top"
@@ -531,7 +545,7 @@
      initial_value="true"
      control_name="BrowserPluginsEnabled"
      label="Enable plugins"
-     left_delta="0"
+     left="25"
      mouse_opaque="true"
      name="browser_plugins_enabled"
      radio_style="false"

From 63d24c9e3e59ac32f5829a2aba524e3330ca10d8 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 6 Apr 2014 13:39:43 +0200
Subject: [PATCH 6/6] Open media filter lists floater centered by default and
 save rect

---
 indra/newview/skins/default/xui/en/floater_media_lists.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/skins/default/xui/en/floater_media_lists.xml b/indra/newview/skins/default/xui/en/floater_media_lists.xml
index e4dcf59825..c9f566a557 100644
--- a/indra/newview/skins/default/xui/en/floater_media_lists.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_lists.xml
@@ -6,6 +6,8 @@
     can_resize="true"
 	height="254"
     name="floatermedialists"
+	positioning="centered"
+	save_rect="true"
 	title="Media Lists"
     width="460"
     min_height="300"