diff --git a/indra/newview/fsradar.h b/indra/newview/fsradar.h
index 593ef7bbd0..985d0bd17f 100644
--- a/indra/newview/fsradar.h
+++ b/indra/newview/fsradar.h
@@ -128,9 +128,9 @@ private:
 	radarfields_map_t		mLastRadarSweep;
 	entry_map_t				mEntryList;
 
-	std::vector<LLUUID>		mRadarEnterAlerts;
-	std::vector<LLUUID>		mRadarLeaveAlerts;
-	std::vector<LLUUID>		mRadarOffsetRequests;
+	uuid_vec_t				mRadarEnterAlerts;
+	uuid_vec_t				mRadarLeaveAlerts;
+	uuid_vec_t				mRadarOffsetRequests;
 	std::vector<LLSD>		mRadarEntriesData;
 	 	
 	S32						mRadarFrameCount;
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index d9e3dee380..374bba3a3c 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -164,7 +164,7 @@ LL_RUN_ERR=$?
 if [ $LL_RUN_ERR -ne 0 ]; then
 	# generic error running the binary
 	echo '*** Bad shutdown ($LL_RUN_ERR). ***'
-	if [ "$(uname -m)" = "x86_64" ]; then
+	if [ "$(uname -m)" = "x86_64" ] && [ "$(file bin/do-not-directly-run-firestorm-bin | grep -o 64-bit )" != "64-bit" ]; then
 		echo
 		cat << EOFMARKER
 You are running the Firestorm Viewer on a x86_64 platform.  The
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 56b8c6f7bb..89db30a19b 100755
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -2237,6 +2237,10 @@ Chcesz wyłączyć Tryb Zajętości przed zakończeniem tej transakcji?
 		Na pewno chcesz wyczyścić bufor Szafy?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
 	</notification>
+	<notification name="ConfirmClearWebBrowserCache">
+		Na pewno chcesz wyczyścić bufor wbudowanej przeglądarki internetowej?
+		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmClearCookies">
 		Na pewno chcesz wyczyścić ciasteczka?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Tak"/>
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 11d250f55d..4b9b593b4b 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
@@ -56,6 +56,7 @@
 				<combo_box.item label="Pięć okien" name="web_5"/>
 				<combo_box.item label="Dziesięć okien" name="web_10"/>
 			</combo_box>
+			<button label="Wyczyść bufor przeglądarki WWW" name="ClearWebBrowserCache" width="195"/>
 			<check_box label="Włącz wtyczki" name="browser_plugins_enabled"/>
 			<check_box label="Akceptuj ciasteczka" name="cookies_enabled"/>
 			<check_box label="Włącz Javascript" name="browser_javascript_enabled"/>