From 53aecb2d4bf0e74e162f2a033e7bfb38d7a5bfed Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Tue, 21 Oct 2014 21:06:45 +0200
Subject: [PATCH 001/229] Minor Polish translation adjustment

---
 indra/newview/skins/default/xui/pl/menu_url_objectim.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/pl/menu_url_objectim.xml b/indra/newview/skins/default/xui/pl/menu_url_objectim.xml
index be59908498..bc2b4f4c6f 100755
--- a/indra/newview/skins/default/xui/pl/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_objectim.xml
@@ -3,7 +3,7 @@
 	<menu_item_call label="Profil obiektu..." name="show_object"/>
 	<menu_item_call label="Zablokuj" name="block_object"/>
 	<menu_item_call label="Pokaż na mapie" name="show_on_map"/>
-	<menu_item_call label="Teleportuj to miejsca obiektu" name="teleport_to_object"/>
+	<menu_item_call label="Teleportuj do miejsca obiektu" name="teleport_to_object"/>
 	<menu_item_call label="Kopiuj nazwę obiektu do schowka" name="url_copy_label"/>
 	<menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/>
 </context_menu>

From 64f6a0bff5b65c998e8cb90e8ffa8850943d4fc5 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 23 Oct 2014 00:25:55 +0200
Subject: [PATCH 002/229] Fix line-endings

---
 indra/newview/lldrawpoolavatar.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 77e1ed7f31..20c1c4952c 100755
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1681,11 +1681,11 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace*
 				{
 					LLPointer<LLVertexBuffer> cur_buffer = facep->getVertexBuffer();
 					const LLVolumeFace& cur_vol_face = volume->getVolumeFace(i);
-					if( cur_vol_face.mNumVertices > 0x10000 || cur_vol_face.mNumVertices < 0 || cur_vol_face.mNumIndices < 0 )
-					{
-						LL_WARNS() << "Skipping face " << i
-								   << " vertices " << cur_vol_face.mNumVertices << " indices " << cur_vol_face.mNumIndices
-								   << " face is possibly corrupted"
+					if( cur_vol_face.mNumVertices > 0x10000 || cur_vol_face.mNumVertices < 0 || cur_vol_face.mNumIndices < 0 )
+					{
+						LL_WARNS() << "Skipping face " << i
+								   << " vertices " << cur_vol_face.mNumVertices << " indices " << cur_vol_face.mNumIndices
+								   << " face is possibly corrupted"
 								   << LL_ENDL;
 						continue;
 					}

From 3da094da09d3056c8882f44f605f3a0a92baa797 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 23 Oct 2014 00:27:09 +0200
Subject: [PATCH 003/229] FIRE-14835: Backout f24928e9e070 (FIRE-7937) as it
 allows rigging to attachment spots instead of joints and can cause
 unpredictable behavior in the viewer

---
 indra/newview/llfloatermodelpreview.cpp | 26 -------------------------
 1 file changed, 26 deletions(-)

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index ee5df1688e..2477612780 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1434,32 +1434,6 @@ LLModelLoader::LLModelLoader( std::string filename, S32 lod, LLModelPreview* pre
 	mJointMap["lShin"] = "mKneeLeft";
 	mJointMap["lFoot"] = "mFootLeft";
 
-// <FS:WF> FIRE-7937 : Patch from Magus Freston - allows ALL bones including all attachment points to be weighted to mesh and animated	
-	mJointMap["Right_Ear"] = "Right Ear";
-    mJointMap["Left_Ear"] = "Left Ear";
-    mJointMap["Right_Eyeball"] = "Right Eyeball";
-    mJointMap["Left_Eyeball"] = "Left Eyeball";
-    mJointMap["Right_Shoulder"] = "Right Shoulder";
-    mJointMap["Left_Shoulder"] = "Left Shoulder";
-    mJointMap["R_Upper_Arm"] = "R Upper Arm";
-    mJointMap["L_Upper_Arm"] = "L Upper Arm";
-    mJointMap["R_Forearm"] = "R Forearm";
-    mJointMap["L_Forearm"] = "L Forearm";
-    mJointMap["Right_Hand"] = "Right Hand";
-    mJointMap["Left_Hand"] = "Left Hand";
-    mJointMap["Right_Pec"] = "Right Pec";
-    mJointMap["Left_Pec"] = "Left Pec";
-    mJointMap["Avatar_Center"] = "Avatar Center";
-    mJointMap["Right_Hip"] = "Right Hip";
-    mJointMap["Left_Hip"] = "Left Hip";
-    mJointMap["R_Upper_Leg"] = "R Upper Leg";
-    mJointMap["L_Upper_Leg"] = "L Upper Leg";
-    mJointMap["R_Lower_Leg"] = "R Lower Leg";
-    mJointMap["R_Lower_Leg"] = "R Lower Leg";
-    mJointMap["Right_Foot"] = "Right Foot";
-    mJointMap["Left_Foot"] = "Left Foot";
-// <FS:WF> FIRE-7937 end
-
 	if (mPreview)
 	{
 		//only try to load from slm if viewer is configured to do so and this is the 

From bf708b6deabc58b19d1c0a5c246e3f2be82c190b Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Thu, 23 Oct 2014 11:12:39 +0200
Subject: [PATCH 004/229] FIRE-14801; (Windows x86/Linux x86/Mac x86) Update
 lltqwebkit.

---
 autobuild.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 87a03c8de7..f35ea233bf 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1872,9 +1872,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4a98d727561cd1f4ac5ee02907411df1</string>
+              <string>3c2b6be4c78b2479c3fae612e1053d37</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/250147/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20120228.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/canonical_3p-llqtwebkit2/rev/295522/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20141015.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -1884,9 +1884,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>f50e5f0cc880c55b3f0f7e67dc8f7221</string>
+              <string>d31358176b9ba8c676458cc061767c0b</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/250147/arch/Linux/installer/llqtwebkit-4.7.1-linux-20120228.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/canonical_3p-llqtwebkit2/rev/295522/arch/Linux/installer/llqtwebkit-4.7.1-linux-20141015.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -1908,9 +1908,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>5e3cd6af397e853a963a6de40d440ff4</string>
+              <string>bb4e8c8006c8a7aef6d3e3c36a8cebbf</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/250147/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20120228.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/canonical_3p-llqtwebkit2/rev/295522/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20141015.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>

From 6252c817752543850db0bbd03a366c08ec00b6e8 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Thu, 23 Oct 2014 12:23:33 +0200
Subject: [PATCH 005/229] FIRE-14801; (Windows x64) Update lltqwebkit.

---
 package_override.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_override.ini b/package_override.ini
index 5d4ea8635b..67c95f4a56 100644
--- a/package_override.ini
+++ b/package_override.ini
@@ -84,7 +84,7 @@ windows = http://downloads.phoenixviewer.com/google_breakpad-0.0.0-rev1099-windo
 windows = http://downloads.phoenixviewer.com/gntp_growl-1.0-windows-x64-20130802.tar.bz2|e10481fb350646db17597728b6e23fa5
 
 [slplugin_x86]
-windows = http://downloads.phoenixviewer.com/slplugin_x86-1.2-windows-x64-20140819.tar.bz2|3cab2257ddd232a802091c41daae3f2c
+windows = http://downloads.phoenixviewer.com/slplugin_x86-1.2-windows-20141023.tar.bz2|c9fea1399b836323d9379e022f13e488
 
 [wix]
 windows = http://downloads.phoenixviewer.com/wix-3.7-windows-x64-20130804.tar.bz2|2c932229c34ae59f567d7c938d181455

From 3c3d74e487146dfa2f1b6b7f868c40bc9bb2ea8f Mon Sep 17 00:00:00 2001
From: Cinder <cinder@sdf.org>
Date: Thu, 23 Oct 2014 12:45:05 -0600
Subject: [PATCH 006/229] STORM-2081 - Guard against null gWindowImplementation
 when fullscreen (crashes OS X Yosemite)

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

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 9f2bcacbf5..6d4ca3dc78 100755
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -238,7 +238,10 @@ void callFocus()
 
 void callFocusLost()
 {
-	gWindowImplementation->getCallbacks()->handleFocusLost(gWindowImplementation);
+	if (gWindowImplementation)
+	{
+		gWindowImplementation->getCallbacks()->handleFocusLost(gWindowImplementation);
+	}
 }
 
 void callRightMouseDown(float *pos, MASK mask)

From 0d3eb8eef7169d42f030b03148e33bc657115e34 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 20 Mar 2014 11:37:20 +0200
Subject: [PATCH 007/229] MAINT-1190 FIXED Update visual param list when
 changing sex.

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

diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 34cff61827..7d0061895e 100755
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -956,7 +956,7 @@ void LLPanelEditWearable::onCommitSexChange()
         gAgentAvatarp->updateSexDependentLayerSets( FALSE );
 
         gAgentAvatarp->updateVisualParams();
-
+        showWearable(mWearablePtr, TRUE, TRUE);
         updateScrollingPanelUI();
 }
 

From c3c1dd55e465b3d70a018ab4326aa13a987cb27b Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Fri, 24 Oct 2014 11:20:30 +0200
Subject: [PATCH 008/229] Version 4.7.0 for default branch.

---
 indra/Version                    | 2 +-
 indra/newview/VIEWER_VERSION.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/Version b/indra/Version
index 4cfc99d299..53e12f7c5c 100644
--- a/indra/Version
+++ b/indra/Version
@@ -1 +1 @@
-VERSION_VIEWER=4.6.8
+VERSION_VIEWER=4.7.0
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index d3acad0593..f6cdf40983 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-4.6.8
+4.7.0

From 8012d781c1c5b54e01ba7bfbc81bf977a8650829 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Fri, 24 Oct 2014 12:11:48 +0200
Subject: [PATCH 009/229] Don't link against jscore with latest webkit.

---
 indra/cmake/WebKitLibPlugin.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 02c8f388ea..58e7704612 100755
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -74,7 +74,7 @@ elseif (LINUX)
           QtGui
           QtCore
           jpeg
-          jscore
+#          jscore
           fontconfig
           X11
           Xrender

From c08db1f35d86b9ef638d031344498f5c4e8ca269 Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Sat, 25 Oct 2014 01:36:43 +0100
Subject: [PATCH 010/229] FIRE-14708 : Menu search box added to Starlight and
 Starlight CUI skins - by Hitomi Tiponi

---
 .../starlight/xui/en/panel_status_bar.xml     | 43 +++++++++++++++++++
 .../starlightcui/xui/en/panel_status_bar.xml  | 42 ++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/indra/newview/skins/starlight/xui/en/panel_status_bar.xml b/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
index b0ee03d064..4117592ad3 100644
--- a/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
@@ -215,6 +215,49 @@
      name="buycurrencylabel">
         L$ [AMT]
     </panel.string>
+
+	<panel
+	 height="18"
+	 left_pad="12"
+	 top="1"
+	 width="100"
+	 follows="right|top"
+	 name="menu_search_panel"
+	 background_opaque="true"
+	 background_visible="true"
+	 bg_opaque_color="MouseGray"
+	 visibility_control="FSMenuSearch">
+		<search_editor
+		 clear_button_visible="true"
+		 follows="left|top"
+		 height="18"
+		 label="Search Menu"
+		 layout="topleft"
+		 left="0"
+		 max_length_bytes="255"
+		 name="search_menu_edit"
+		 right="-1"
+		 text_pad_left="6"
+		 tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the menu."
+		 top="0">
+			<search_button 
+			 top_pad="4"
+			 left_pad="4" 
+			 width="12"
+			 height="12" 
+			 image_unselected="Search"
+			 image_selected="Search"/>
+			<clear_button
+			 bottom="2"
+			 height="12"
+			 image_unselected="Icon_Close_Foreground"
+			 image_selected="Icon_Close_Press"
+			 pad_right="4"
+			 pad_left="4"
+			 width="12"/>
+		</search_editor>
+	</panel>
+
   <panel
     height="18"
     left="-385"
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml b/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
index b6ab3e543e..c38b36a0a9 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
@@ -214,6 +214,48 @@
      name="buycurrencylabel">
         L$ [AMT]
     </panel.string>
+
+	<panel
+	 height="18"
+	 left_pad="12"
+	 top="1"
+	 width="100"
+	 follows="right|top"
+	 name="menu_search_panel"
+	 background_opaque="false"
+	 background_visible="true"
+	 visibility_control="FSMenuSearch">
+		<search_editor
+		 clear_button_visible="true"
+		 follows="left|top"
+		 height="18"
+		 label="Search Menu"
+		 layout="topleft"
+		 left="0"
+		 max_length_bytes="255"
+		 name="search_menu_edit"
+		 right="-1"
+		 text_pad_left="6"
+		 tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the menu."
+		 top="0">
+			<search_button 
+			 top_pad="4"
+			 left_pad="4" 
+			 width="12"
+			 height="12" 
+			 image_unselected="Search"
+			 image_selected="Search"/>
+			<clear_button
+			 bottom="2"
+			 height="12"
+			 image_unselected="Icon_Close_Foreground"
+			 image_selected="Icon_Close_Press"
+			 pad_right="4"
+			 pad_left="4"
+			 width="12"/>
+		</search_editor>
+	</panel>
+
   <panel
     height="18"
     left="-385"

From fb5589e6c7b82ff96361c009d17f688f4bd0e6e5 Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Sat, 25 Oct 2014 02:04:59 +0100
Subject: [PATCH 011/229] FIRE-14708 : Pixel bumping to fix cut off label

---
 indra/newview/skins/starlight/xui/en/panel_status_bar.xml    | 2 +-
 indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/starlight/xui/en/panel_status_bar.xml b/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
index 4117592ad3..b6a34373a8 100644
--- a/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
@@ -220,7 +220,7 @@
 	 height="18"
 	 left_pad="12"
 	 top="1"
-	 width="100"
+	 width="110"
 	 follows="right|top"
 	 name="menu_search_panel"
 	 background_opaque="true"
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml b/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
index c38b36a0a9..1a3926f2bd 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
@@ -219,7 +219,7 @@
 	 height="18"
 	 left_pad="12"
 	 top="1"
-	 width="100"
+	 width="110"
 	 follows="right|top"
 	 name="menu_search_panel"
 	 background_opaque="false"

From 3e7f44c912f254c144acc7a88859be7fab04b4b7 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sat, 25 Oct 2014 21:02:08 +0200
Subject: [PATCH 012/229] Updated Polish translation

---
 .../xui/pl/floater_animation_bvh_preview.xml  | 45 +++++++++----------
 .../default/xui/pl/floater_edit_day_cycle.xml |  1 +
 .../default/xui/pl/floater_fast_timers.xml    |  2 -
 .../default/xui/pl/floater_import_collada.xml |  1 -
 .../xui/pl/floater_merchant_outbox.xml        |  1 -
 .../default/xui/pl/floater_model_preview.xml  | 15 +++----
 .../default/xui/pl/floater_perm_prefs.xml     |  1 -
 .../xui/pl/floater_preferences_proxy.xml      |  1 -
 .../xui/pl/floater_translation_settings.xml   |  5 +--
 .../default/xui/pl/panel_sound_devices.xml    |  4 +-
 10 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
index 954eede9f4..9a7ef95b9d 100644
--- a/indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
@@ -136,34 +136,33 @@ Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund.
 		Ekspresja
 	</text>
 	<combo_box name="emote_combo" tool_tip="Kontroluj mimikę twarzy w czasie animacji">
-		<item label="(Brak)" name="[None]"/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Obawa" name="Afraid" value="Obawa"/>
-		<item label="Złość" name="Angry" value="Złość"/>
-		<item label="Duży uśmiech" name="BigSmile" value="Duży uśmiech"/>
-		<item label="Znudzenie" name="Bored" value="Znudzenie"/>
-		<item label="Płacz" name="Cry" value="Płacz"/>
-		<item label="Wzgarda" name="Disdain" value="Wzgarda"/>
-		<item label="Zakłopotanie" name="Embarrassed" value="Zakłopotanie"/>
-		<item label="Marszczenie brwi" name="Frown" value="Marszczenie brwi"/>
-		<item label="Pocałunek" name="Kiss" value="Pocałunek"/>
-		<item label="Śmiech" name="Laugh" value="Śmiech"/>
-		<item label="Odrzucenie" name="Repulsed" value="Odrzucenie"/>
-		<item label="Smutek" name="Sad" value="Smutek"/>
-		<item label="Wzruszenie ramionami" name="Shrug" value="Wzruszenie ramionami"/>
-		<item label="Uśmiech" name="Smile" value="Uśmiech"/>
-		<item label="Niespodzianka" name="Surprise" value="Niespodzianka"/>
-		<item label="Mrugnięcie" name="Wink" value="Mrugnięcie"/>
-		<item label="Zmartwienie" name="Worry" value="Zmartwienie"/>
+		<item label="(Brak)" name="[None]" />
+		<item label="Obawa" name="Afraid" />
+		<item label="Złość" name="Angry" />
+		<item label="Duży uśmiech" name="BigSmile" />
+		<item label="Znudzenie" name="Bored" />
+		<item label="Płacz" name="Cry" />
+		<item label="Wzgarda" name="Disdain" />
+		<item label="Zakłopotanie" name="Embarrassed" />
+		<item label="Marszczenie brwi" name="Frown" />
+		<item label="Pocałunek" name="Kiss" />
+		<item label="Śmiech" name="Laugh" />
+		<item label="Odrzucenie" name="Repulsed" />
+		<item label="Smutek" name="Sad" />
+		<item label="Wzruszenie ramionami" name="Shrug" />
+		<item label="Uśmiech" name="Smile" />
+		<item label="Niespodzianka" name="Surprise" />
+		<item label="Mrugnięcie" name="Wink" />
+		<item label="Zmartwienie" name="Worry" />
 	</combo_box>
 	<text name="preview_label">
 		Podgląd gdy:
 	</text>
 	<combo_box name="preview_base_anim" tool_tip="Przetestuj zachowanie animacji kiedy awatar wykonuje normalne czynności">
-		<item label="Stoisz" name="Standing" value="Stoisz"/>
-		<item label="Chodzisz" name="Walking" value="Chodzisz"/>
-		<item label="Siedzisz" name="Sitting" value="Siedzisz"/>
-		<item label="Latasz" name="Flying" value="Latasz"/>
+		<item label="Stoisz" name="Standing" />
+		<item label="Chodzisz" name="Walking" />
+		<item label="Siedzisz" name="Sitting" />
+		<item label="Latasz" name="Flying" />
 	</combo_box>
 	<spinner label="Łagodź wej. (sek)" name="ease_in_time" tool_tip="Ilość czasu (w sekundach), po których animacje mieszają się"/>
 	<spinner label="Łagodź wyj. (sek)" name="ease_out_time" tool_tip="Ilość czasu (w sekundach), po których animacje oddzielają się"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/pl/floater_edit_day_cycle.xml
index bf6c66f1a4..5c96601c71 100644
--- a/indra/newview/skins/default/xui/pl/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/pl/floater_edit_day_cycle.xml
@@ -54,6 +54,7 @@
     <text name="WLCurKeyPresetText">
         Niebo:
     </text>
+    <combo_box label="Ustawienie" name="WLSkyPresets" />
     <text name="WLCurKeyTimeText">
         Czas:
     </text>
diff --git a/indra/newview/skins/default/xui/pl/floater_fast_timers.xml b/indra/newview/skins/default/xui/pl/floater_fast_timers.xml
index f41fe33e48..a526e0a0bb 100644
--- a/indra/newview/skins/default/xui/pl/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/pl/floater_fast_timers.xml
@@ -6,12 +6,10 @@
     <item name="2x Average" label="2x średnia"/>
     <item name="Max" label="Maksimum"/>
     <item name="Recent Max" label="Ostatnie maksimum"/>
-    <item name="100ms" label="100ms"/>
   </combo_box>
   <combo_box name="metric_combo">
     <item name="Time" label="Czas"/>
     <item name="Number of Calls" label="Ilość odwołań"/>
-    <item name="Hz" label="Hz"/>
   </combo_box>
   <button name="pause_btn" label="Pauza" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_import_collada.xml b/indra/newview/skins/default/xui/pl/floater_import_collada.xml
index aadaf10c98..124ae67a81 100644
--- a/indra/newview/skins/default/xui/pl/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/pl/floater_import_collada.xml
@@ -10,7 +10,6 @@
 	Status: [STATUS]
   </text>
    <button name="cancel" label="Anuluj"/>
-   <button name="ok" label="OK" />
   <string name="status_idle">Bezczynny</string>
   <string name="status_uploading">Ładowanie [NAME]</string>
   <string name="status_creating">Tworzenie obiektu [NAME]</string>
diff --git a/indra/newview/skins/default/xui/pl/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/pl/floater_merchant_outbox.xml
index 7f1f73c665..4853449752 100644
--- a/indra/newview/skins/default/xui/pl/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/pl/floater_merchant_outbox.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_merchant_outbox" title="Skrzynka nadawcza kupca">
-	<string name="OutboxFolderCount1">1 folder</string>
 	<string name="OutboxFolderCountN">Folderów: [NUM]</string>
 	<string name="OutboxImporting">Wysyłanie folderów...</string>
 	<string name="OutboxInitializing">Inicjalizacja...</string>
diff --git a/indra/newview/skins/default/xui/pl/floater_model_preview.xml b/indra/newview/skins/default/xui/pl/floater_model_preview.xml
index af44969669..2701447142 100644
--- a/indra/newview/skins/default/xui/pl/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_model_preview.xml
@@ -43,10 +43,10 @@
     </panel>
     <tab_container name="import_tab">
         <panel label="Poziom detali" name="lod_panel" title="Poziom detali">
-            <text name="source" value="Źródło" />
-            <text name="triangles" value="Trójkąty" />
-            <text name="vertices" value="Wierzchołki" />
-            <text name="high_label" initial_value="Wysoki" value="Wysoki" />
+            <text initial_value="Źródło" name="source" value="Źródło" />
+            <text initial_value="Trójkąty" name="triangles" value="Trójkąty" />
+            <text initial_value="Wierzchołki" name="vertices" value="Wierzchołki" />
+            <text initial_value="Wysoki" name="high_label" value="Wysoki" />
             <combo_box name="lod_source_high">
                 <item name="Load from file" label="Ładuj z pliku" />
                 <item name="Generate" label="Generuj" />
@@ -183,7 +183,7 @@
      </panel>
     </tab_container>
     <panel name="weights_and_warning_panel">
-       <button label="Przelicz wagi i opłatę" name="calculate_btn" tool_tip="Calculate weights &amp;fee"/>
+       <button label="Przelicz wagi i opłatę" name="calculate_btn" tool_tip="Przelicz wagi i opłatę"/>
        <button label="Anuluj" name="cancel_btn"/>
        <button label="Załaduj" name="ok_btn" tool_tip="Załaduj na serwer"/>
        <button label="Wyczyść i zresetuj" name="reset_btn"/>
@@ -210,10 +210,9 @@
        </text>
     </panel>
 </panel>
-
 <text name="lod_label">
- Podgląd:
- </text>
+    Podgląd:
+</text>
 <panel name="right_panel">
     <combo_box name="preview_lod_combo" tool_tip="Poziom detali (LOD) do wyświetlania w podglądzie">
         <combo_item name="high">Wysoki</combo_item>
diff --git a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
index 3c801c36c2..6c40822bf7 100755
--- a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
@@ -10,6 +10,5 @@
 		<check_box label="Kopiowanie" name="next_owner_copy"/>
 		<check_box label="Oddawanie/Sprzedaż" name="next_owner_transfer"/>
 	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
 	<button label="Anuluj" label_selected="Anuluj" name="cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/pl/floater_preferences_proxy.xml
index 0567bc766d..4ee0167fbb 100644
--- a/indra/newview/skins/default/xui/pl/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preferences_proxy.xml
@@ -35,6 +35,5 @@
 		<radio_item label="Użyj proxy HTTP" name="OtherHTTPProxy" tool_tip="Ruch HTTP niepowiązany ze stronami internetowymi będzie przesyłany przez proxy dla stron internetowych skonfigurowane powyżej."/>
 		<radio_item label="Użyj proxy SOCKS 5" name="OtherSocksProxy" tool_tip="Ruch HTTP niepowiązany ze stronami internetowymi będzie przesyłany przez proxy Socks 5."/>
 	</radio_group>
-	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_translation_settings.xml b/indra/newview/skins/default/xui/pl/floater_translation_settings.xml
index 7d23fe3e4c..2b30fcc6e7 100644
--- a/indra/newview/skins/default/xui/pl/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/pl/floater_translation_settings.xml
@@ -32,13 +32,10 @@
  </text>
  <line_editor default_text="Wpisz Bing AppID i kliknij na &quot;Weryfikuj&quot;" name="bing_api_key" />
  <button label="Weryfikuj" name="verify_bing_api_key_btn" />	
- <text name="google_api_key_label">
-  Google [http://code.google.com/apis/language/translate/v2/getting_started.html#auth API key]:
- </text>
  <line_editor default_text="Wpisz klucz Google API i kliknij na &quot;Weryfikuj&quot;" name="google_api_key" />
  <button label="Weryfikuj" name="verify_google_api_key_btn" />	
  <text name="google_links_text">
-  [http://code.google.com/apis/language/translate/v2/pricing.html Koszty] | [https://code.google.com/apis/console Statystyki] 
+  [http://code.google.com/apis/language/translate/v2/pricing.html Koszty] | [https://code.google.com/apis/console Statystyki]
  </text>
  <button label="Gotowe" name="ok_btn" />
  <button label="Anuluj" name="cancel_btn" />	
diff --git a/indra/newview/skins/default/xui/pl/panel_sound_devices.xml b/indra/newview/skins/default/xui/pl/panel_sound_devices.xml
index 752ce91ba9..61f272b737 100644
--- a/indra/newview/skins/default/xui/pl/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/pl/panel_sound_devices.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Ustawienia urządzenia" name="device_settings_panel">
     <panel.string name="default_text">
         Domyślne
@@ -5,9 +6,6 @@
     <string name="name_no_device">
         Brak
     </string>
-    <string name="name_no_device">
-        Brak
-    </string>
     <string name="name_default_system_device">
         Domyślne systemowe
     </string>

From 490b5ad5fcbc0476c3946bbb18f64f7184da363d Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Wed, 13 Aug 2014 18:12:25 -0700
Subject: [PATCH 013/229] Ported from defective branch.

---
 indra/newview/app_settings/settings.xml | 13 ++++++++-
 indra/newview/llappviewer.cpp           |  5 +++-
 indra/newview/llvoicevivox.cpp          | 35 +++++++++++++++++++------
 indra/newview/llvoicevivox.h            |  2 ++
 4 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 258128db47..f7d1204329 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16907,7 +16907,7 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>VivoxDebugLevel</key>
     <map>
       <key>Comment</key>
-      <string>Logging level to use when launching the vivox daemon</string>
+      <string>Logging level to use when launching the vivox daemon SPATTERS FIX VALUE BEFORE CHECKIN</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -16917,6 +16917,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Backup</key>
       <integer>0</integer>
     </map>
+    <key>VivoxShutdownTimeout</key>
+    <map>
+      <key>Comment</key>
+      <string>shutdown timeout in miliseconds.  The amount of time to wait for the service to shutdown gracefully after the last disconnect</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>500</string>
+    </map>
     <key>VivoxDebugSIPURIHostName</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 123de24ed1..294fe11c5a 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -5686,7 +5686,10 @@ void LLAppViewer::idle()
 	// Handle the regular UI idle callbacks as well as
 	// hover callbacks
 	//
-
+    
+#ifdef LL_DARWIN   SPATTERS may want to make this mac-only.  Test on Windows.
+	if (mQuitRequested)  //MAINT-4243
+#endif
 	{
 // 		LL_RECORD_BLOCK_TIME(FTM_IDLE_CB);
 
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 18e34c150e..d153663ca2 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -476,14 +476,10 @@ void LLVivoxVoiceClient::connectorCreate()
 
 	std::string savedLogLevel = gSavedSettings.getString("VivoxDebugLevel");
 	
-	// <FS:Ansariel> Fixing Vivox debug level
-	//if(savedLogLevel != "-0")
 	if(savedLogLevel != "0")
-	// </FS:Ansariel>
 	{
 		LL_DEBUGS("Voice") << "creating connector with logging enabled" << LL_ENDL;
 		// <FS:Ansariel> Fixing Vivox debug level
-		//loglevel = "0";
 		loglevel = savedLogLevel;
 		// </FS:Ansariel>
 	}
@@ -798,15 +794,30 @@ void LLVivoxVoiceClient::stateMachine()
 						// vivox executable exists.  Build the command line and launch the daemon.
 						LLProcess::Params params;
 						params.executable = exe_path;
-						// SLIM SDK: these arguments are no longer necessary.
-//						std::string args = " -p tcp -h -c";
+
 						std::string loglevel = gSavedSettings.getString("VivoxDebugLevel");
+						std::string shutdown_timeout = gSavedSettings.getString("VivoxShutdownTimeout");
 						if(loglevel.empty())
 						{
 							loglevel = "0";	// turn logging off completely
 						}
+
 						params.args.add("-ll");
 						params.args.add(loglevel);
+
+						//if (loglevel != "0") //SPATTERS
+						{
+							std::string log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
+							params.args.add("-lf");
+							params.args.add(log_folder);
+						}
+
+						if(!shutdown_timeout.empty())
+						{
+							params.args.add("-st");
+							params.args.add(shutdown_timeout);
+						}
+
 						// <FS:Ansariel> Voice in multiple instances; by Latif Khalifa
 						if (gSavedSettings.getBOOL("VoiceMultiInstance"))
 						{
@@ -820,6 +831,7 @@ void LLVivoxVoiceClient::stateMachine()
 							}
 						}
 						// </FS:Ansariel>
+
 						params.cwd = gDirUtilp->getAppRODataDir();
 						sGatewayPtr = LLProcess::create(params);
 
@@ -1360,7 +1372,7 @@ void LLVivoxVoiceClient::stateMachine()
 				{
 					// Connect to a session by URI
 					sessionCreateSendMessage(mAudioSession, true, false);
-				}
+				}  
 
 				notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_JOINING);
 				setState(stateJoiningSession);
@@ -1536,7 +1548,7 @@ void LLVivoxVoiceClient::stateMachine()
 			// Always reset the terminate request flag when we get here.
 			mSessionTerminateRequested = false;
 
-			if((mVoiceEnabled || !mIsInitialized) && !mRelogRequested)
+			if((mVoiceEnabled || !mIsInitialized) && !mRelogRequested  && !LLApp::isExiting())
 			{				
 				// Just leaving a channel, go back to stateNoChannel (the "logged in but have no channel" state).
 				setState(stateNoChannel);
@@ -1555,6 +1567,7 @@ void LLVivoxVoiceClient::stateMachine()
 		//MARK: stateLoggingOut
 		case stateLoggingOut:			// waiting for logout response
 			// The handler for the AccountLoginStateChangeEvent will transition from here to stateLoggedOut.
+			LL_INFOS() << "SPATTERS do I need to stay alive here?" << LL_ENDL;
 		break;
 		
 		//MARK: stateLoggedOut
@@ -2344,6 +2357,12 @@ static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVe
 #endif
 }
 
+void LLVivoxVoiceClient::setHidden(bool hidden)
+{
+    mHidden = hidden;
+    return;
+}
+
 void LLVivoxVoiceClient::sendPositionalUpdate(void)
 {	
 	std::ostringstream stream;
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index d6f2bd05b1..5d8efa5c88 100755
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -750,6 +750,7 @@ private:
 	std::string getAudioSessionURI();
 	std::string getAudioSessionHandle();
 			
+    void setHidden(bool hidden);
 	void sendPositionalUpdate(void);
 	
 	void buildSetCaptureDevice(std::ostringstream &stream);
@@ -778,6 +779,7 @@ private:
 	
 	bool		mMuteMic;
 	bool		mMuteMicDirty;
+    bool        mHidden;       //Set to true during teleport to hide the agent's position.
 			
 	// Set to true when the friends list is known to have changed.
 	bool		mFriendsListDirty;

From 0dd6caecce1ee204233ee3329463bc2c7fd6c5d2 Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Fri, 15 Aug 2014 17:30:09 -0700
Subject: [PATCH 014/229] Added delay to Windows shutdown to let SLVoice die a
 good death.

---
 indra/newview/app_settings/settings.xml |  4 ++--
 indra/newview/llappviewer.cpp           |  2 +-
 indra/newview/llvoicevivox.cpp          | 13 ++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f7d1204329..942abab731 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16907,7 +16907,7 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>VivoxDebugLevel</key>
     <map>
       <key>Comment</key>
-      <string>Logging level to use when launching the vivox daemon SPATTERS FIX VALUE BEFORE CHECKIN</string>
+      <string>Logging level to use when launching the vivox daemon</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -16926,7 +16926,7 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>500</string>
+      <string>5</string>
     </map>
     <key>VivoxDebugSIPURIHostName</key>
     <map>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 294fe11c5a..607cc74dad 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -5687,7 +5687,7 @@ void LLAppViewer::idle()
 	// hover callbacks
 	//
     
-#ifdef LL_DARWIN   SPATTERS may want to make this mac-only.  Test on Windows.
+#ifdef LL_DARWIN   
 	if (mQuitRequested)  //MAINT-4243
 #endif
 	{
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index d153663ca2..3345cbab9b 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -805,12 +805,9 @@ void LLVivoxVoiceClient::stateMachine()
 						params.args.add("-ll");
 						params.args.add(loglevel);
 
-						//if (loglevel != "0") //SPATTERS
-						{
-							std::string log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
-							params.args.add("-lf");
-							params.args.add(log_folder);
-						}
+						std::string log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
+						params.args.add("-lf");
+						params.args.add(log_folder);
 
 						if(!shutdown_timeout.empty())
 						{
@@ -1567,7 +1564,6 @@ void LLVivoxVoiceClient::stateMachine()
 		//MARK: stateLoggingOut
 		case stateLoggingOut:			// waiting for logout response
 			// The handler for the AccountLoginStateChangeEvent will transition from here to stateLoggedOut.
-			LL_INFOS() << "SPATTERS do I need to stay alive here?" << LL_ENDL;
 		break;
 		
 		//MARK: stateLoggedOut
@@ -1671,6 +1667,9 @@ void LLVivoxVoiceClient::stateMachine()
 
 void LLVivoxVoiceClient::closeSocket(void)
 {
+#ifdef LL_WINDOWS
+	_sleep(3000);	//Wait a moment for socket to close.  SPATTERS
+#endif  
 	mSocket.reset();
 	mConnected = false;
 	mConnectorHandle.clear();

From 10e560ba252a6fbe55355a12135c4d2c47258c4e Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Fri, 15 Aug 2014 18:49:54 -0700
Subject: [PATCH 015/229] Allegedly hides voice position on teleport.  Needs
 testing.

---
 indra/newview/llagent.cpp       |  8 ++++++++
 indra/newview/llappviewer.cpp   |  4 ++--
 indra/newview/llvoiceclient.cpp |  7 +++++++
 indra/newview/llvoiceclient.h   |  3 +++
 indra/newview/llvoicevivox.cpp  | 27 +++++++++++++++++++++++++--
 indra/newview/llvoicevivox.h    |  2 +-
 6 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index ba7d354f4a..b6df58a710 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -4498,6 +4498,10 @@ void LLAgent::restartFailedTeleportRequest()
 
 void LLAgent::clearTeleportRequest()
 {
+    if(LLVoiceClient::instanceExists())
+    {
+        LLVoiceClient::getInstance()->setHidden(FALSE);
+    }
 	mTeleportRequest.reset();
 }
 
@@ -4516,6 +4520,10 @@ bool LLAgent::hasPendingTeleportRequest()
 
 void LLAgent::startTeleportRequest()
 {
+    if(LLVoiceClient::instanceExists())
+    {
+        LLVoiceClient::getInstance()->setHidden(TRUE);
+    }
 	if (hasPendingTeleportRequest())
 	{
 		if  (!isMaturityPreferenceSyncedWithServer())
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 607cc74dad..0ee34a5975 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -5687,8 +5687,8 @@ void LLAppViewer::idle()
 	// hover callbacks
 	//
     
-#ifdef LL_DARWIN   
-	if (mQuitRequested)  //MAINT-4243
+#ifdef LL_DARWIN
+	if (!mQuitRequested)  //MAINT-4243
 #endif
 	{
 // 		LL_RECORD_BLOCK_TIME(FTM_IDLE_CB);
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 7d29eaa256..e5c21e9d10 100755
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -165,6 +165,13 @@ void LLVoiceClient::userAuthorized(const std::string& user_id, const LLUUID &age
 	mVoiceModule->userAuthorized(user_id, agentID);
 }
 
+void LLVoiceClient::setHidden(bool hidden)
+{
+    if (mVoiceModule)
+    {
+        mVoiceModule->setHidden(hidden);
+    }
+}
 
 void LLVoiceClient::terminate()
 {
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index bcdba2b587..6834af3f98 100755
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -105,6 +105,8 @@ public:
 	virtual void updateSettings()=0; // call after loading settings and whenever they change
 	
 	virtual bool isVoiceWorking() const = 0; // connected to a voice server and voice channel
+    
+    virtual void setHidden(bool hidden)=0;  //  Hides the user from voice.
 
 	virtual const LLVoiceVersionInfo& getVersion()=0;
 	
@@ -363,6 +365,7 @@ public:
 
 	void setCaptureDevice(const std::string& name);
 	void setRenderDevice(const std::string& name);
+    void setHidden(bool hidden);
 
 	const LLVoiceDeviceList& getCaptureDevices();
 	const LLVoiceDeviceList& getRenderDevices();
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 3345cbab9b..cdfe82199a 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -70,6 +70,7 @@
 #include "apr_base64.h"
 
 #define USE_SESSION_GROUPS 0
+#define VX_NULL_POSITION -2147483648.0 /*The Silence*/
 
 extern LLMenuBarGL* gMenuBarView;
 extern void handle_voice_morphing_subscribe();
@@ -2358,7 +2359,9 @@ static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVe
 
 void LLVivoxVoiceClient::setHidden(bool hidden)
 {
+    //SPATTERS hide me
     mHidden = hidden;
+    sendPositionalUpdate();
     return;
 }
 
@@ -2383,7 +2386,17 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void)
 		l = mAvatarRot.getLeftRow();
 		u = mAvatarRot.getUpRow();
 		a = mAvatarRot.getFwdRow();
-		pos = mAvatarPosition;
+        if (mHidden)
+        {
+            for (int i=0;i<3;++i)
+            {
+                pos.mdV[i] = VX_NULL_POSITION;
+            }
+        }
+        else
+        {
+            pos = mAvatarPosition;
+        }
 		vel = mAvatarVelocity;
 
 		// SLIM SDK: the old SDK was doing a transform on the passed coordinates that the new one doesn't do anymore.
@@ -2454,7 +2467,17 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void)
 		l = earRot.getLeftRow();
 		u = earRot.getUpRow();
 		a = earRot.getFwdRow();
-		pos = earPosition;
+        if (mHidden)
+        {
+            for (int i=0;i<3;++i)
+            {
+                pos.mdV[i] = VX_NULL_POSITION;
+            }
+        }
+        else
+        {
+            pos = earPosition;
+        }
 		vel = earVelocity;
 
 //		LL_DEBUGS("Voice") << "Sending listener position " << earPosition << LL_ENDL;
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 5d8efa5c88..8988705517 100755
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -750,7 +750,7 @@ private:
 	std::string getAudioSessionURI();
 	std::string getAudioSessionHandle();
 			
-    void setHidden(bool hidden);
+    void setHidden(bool hidden); //virtual
 	void sendPositionalUpdate(void);
 	
 	void buildSetCaptureDevice(std::ostringstream &stream);

From 998fd5a098699a512a50159a779208dd55215733 Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Tue, 19 Aug 2014 15:38:56 -0700
Subject: [PATCH 016/229] Set null position before value gets transformed.

---
 indra/newview/llvoicevivox.cpp | 46 ++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index cdfe82199a..3cf6066812 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -1669,7 +1669,7 @@ void LLVivoxVoiceClient::stateMachine()
 void LLVivoxVoiceClient::closeSocket(void)
 {
 #ifdef LL_WINDOWS
-	_sleep(3000);	//Wait a moment for socket to close.  SPATTERS
+	_sleep(3000);	//Wait a moment for socket to close.
 #endif  
 	mSocket.reset();
 	mConnected = false;
@@ -2359,8 +2359,8 @@ static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVe
 
 void LLVivoxVoiceClient::setHidden(bool hidden)
 {
-    //SPATTERS hide me
     mHidden = hidden;
+    
     sendPositionalUpdate();
     return;
 }
@@ -2386,6 +2386,14 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void)
 		l = mAvatarRot.getLeftRow();
 		u = mAvatarRot.getUpRow();
 		a = mAvatarRot.getFwdRow();
+
+        pos = mAvatarPosition;
+		vel = mAvatarVelocity;
+
+		// SLIM SDK: the old SDK was doing a transform on the passed coordinates that the new one doesn't do anymore.
+		// The old transform is replicated by this function.
+		oldSDKTransform(l, u, a, pos, vel);
+        
         if (mHidden)
         {
             for (int i=0;i<3;++i)
@@ -2393,17 +2401,8 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void)
                 pos.mdV[i] = VX_NULL_POSITION;
             }
         }
-        else
-        {
-            pos = mAvatarPosition;
-        }
-		vel = mAvatarVelocity;
-
-		// SLIM SDK: the old SDK was doing a transform on the passed coordinates that the new one doesn't do anymore.
-		// The old transform is replicated by this function.
-		oldSDKTransform(l, u, a, pos, vel);
 		
-		stream 
+		stream
 			<< "<Position>"
 				<< "<X>" << pos.mdV[VX] << "</X>"
 				<< "<Y>" << pos.mdV[VY] << "</Y>"
@@ -2467,6 +2466,17 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void)
 		l = earRot.getLeftRow();
 		u = earRot.getUpRow();
 		a = earRot.getFwdRow();
+
+        pos = earPosition;
+		vel = earVelocity;
+
+//		LL_DEBUGS("Voice") << "Sending listener position " << earPosition << LL_ENDL;
+		
+		oldSDKTransform(l, u, a, pos, vel);
+		// <FS:Ansariel> Equal voice volume; by Tigh MacFanatic
+		}
+		// </FS:Ansariel>
+		
         if (mHidden)
         {
             for (int i=0;i<3;++i)
@@ -2478,16 +2488,8 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void)
         {
             pos = earPosition;
         }
-		vel = earVelocity;
-
-//		LL_DEBUGS("Voice") << "Sending listener position " << earPosition << LL_ENDL;
-		
-		oldSDKTransform(l, u, a, pos, vel);
-		// <FS:Ansariel> Equal voice volume; by Tigh MacFanatic
-		}
-		// </FS:Ansariel>
-
-		stream 
+        
+		stream
 			<< "<Position>"
 				<< "<X>" << pos.mdV[VX] << "</X>"
 				<< "<Y>" << pos.mdV[VY] << "</Y>"

From 0452970fb3b522a96fc78b0766b9687ba775578a Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Wed, 20 Aug 2014 14:02:48 -0700
Subject: [PATCH 017/229] Wait for response from SLVoice when sending shutdown.

---
 indra/newview/llvoicevivox.cpp | 15 +++++++++++----
 indra/newview/llvoicevivox.h   |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 3cf6066812..925a1ced42 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -316,6 +316,7 @@ LLVivoxVoiceClient::LLVivoxVoiceClient() :
 	mCaptureBufferRecording(false),
 	mCaptureBufferRecorded(false),
 	mCaptureBufferPlaying(false),
+	mShutdownComplete(true),
 	mPlayRequestCount(0),
 
 	mAvatarNameCacheConnection()
@@ -370,7 +371,14 @@ void LLVivoxVoiceClient::terminate()
 	if(mConnected)
 	{
 		logout();
-		connectorShutdown();
+		connectorShutdown(); 
+		int count=0;
+		while (!mShutdownComplete && 10 > count++)
+		{
+			stateMachine();
+			_sleep(1000);
+		}
+
 		closeSocket();		// Need to do this now -- bad things happen if the destructor does it later.
 		cleanUp();
 	}
@@ -519,6 +527,7 @@ void LLVivoxVoiceClient::connectorShutdown()
 		<< "</Request>"
 		<< "\n\n\n";
 		
+		mShutdownComplete = false;
 		mConnectorHandle.clear();
 		
 		writeString(stream.str());
@@ -1589,6 +1598,7 @@ void LLVivoxVoiceClient::stateMachine()
 		//MARK: stateConnectorStopping
 		case stateConnectorStopping:	// waiting for connector stop
 			// The handler for the Connector.InitiateShutdown response will transition from here to stateConnectorStopped.
+			mShutdownComplete = true;
 		break;
 
 		//MARK: stateConnectorStopped
@@ -1668,9 +1678,6 @@ void LLVivoxVoiceClient::stateMachine()
 
 void LLVivoxVoiceClient::closeSocket(void)
 {
-#ifdef LL_WINDOWS
-	_sleep(3000);	//Wait a moment for socket to close.
-#endif  
 	mSocket.reset();
 	mConnected = false;
 	mConnectorHandle.clear();
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 8988705517..99044b34b1 100755
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -726,6 +726,7 @@ private:
 	bool mRenderDeviceDirty;
 
 	bool mIsInitialized;
+	bool mShutdownComplete;
 	
 	
 	bool checkParcelChanged(bool update = false);

From f81da4875a571da4475f9b65c508a8b3675151b4 Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Wed, 20 Aug 2014 14:04:53 -0700
Subject: [PATCH 018/229] Windows only.

---
 indra/newview/llvoicevivox.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 925a1ced42..71c54f5de2 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -372,6 +372,7 @@ void LLVivoxVoiceClient::terminate()
 	{
 		logout();
 		connectorShutdown(); 
+#ifdef LL_WINDOWS
 		int count=0;
 		while (!mShutdownComplete && 10 > count++)
 		{
@@ -379,6 +380,7 @@ void LLVivoxVoiceClient::terminate()
 			_sleep(1000);
 		}
 
+#endif
 		closeSocket();		// Need to do this now -- bad things happen if the destructor does it later.
 		cleanUp();
 	}

From 63cd97480c05253cbbbf2251a0e6e8761d0e082c Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Thu, 4 Sep 2014 11:28:42 -0700
Subject: [PATCH 019/229] Added code to allow alternate directory destination
 for vivox log.

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llvoicevivox.cpp          |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 942abab731..0dec7fb4fd 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16917,6 +16917,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Backup</key>
       <integer>0</integer>
     </map>
+    <key>VivoxLogDirectory</key>
+    <map>
+        <key>Comment</key>
+        <string>Default log path is Application Support/SecondLife/logs specify alternate absolute path here.</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>String</string>
+        <key>Value</key>
+        <string></string>
+    </map>
     <key>VivoxShutdownTimeout</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 71c54f5de2..b5e869db8c 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -817,7 +817,13 @@ void LLVivoxVoiceClient::stateMachine()
 						params.args.add("-ll");
 						params.args.add(loglevel);
 
-						std::string log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
+						std::string log_folder = gSavedSettings.getString("VivoxLogDirectory");
+                        
+                        if (log_folder.empty())
+                        {
+                            log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
+                        }
+                        
 						params.args.add("-lf");
 						params.args.add(log_folder);
 

From 451d2ce7c3a90332406f904fe681098d605ef514 Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Mon, 8 Sep 2014 13:55:23 -0700
Subject: [PATCH 020/229] Fix position hiding on failed teleports on mac.

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

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index b6df58a710..c92461e9d4 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -4569,6 +4569,11 @@ void LLAgent::handleTeleportFinished()
 
 void LLAgent::handleTeleportFailed()
 {
+    if(LLVoiceClient::instanceExists())
+    {
+        LLVoiceClient::getInstance()->setHidden(FALSE);
+    }
+
 	if (mTeleportRequest != NULL)
 	{
 		mTeleportRequest->setStatus(LLTeleportRequest::kFailed);

From eb496b1baebdc7c386607ee0be82881925f27a52 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 26 Oct 2014 02:21:30 +0200
Subject: [PATCH 021/229] Correct patch import

---
 indra/newview/llvoicevivox.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index b5e869db8c..224ae57593 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -2499,10 +2499,6 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void)
                 pos.mdV[i] = VX_NULL_POSITION;
             }
         }
-        else
-        {
-            pos = earPosition;
-        }
         
 		stream
 			<< "<Position>"

From 4c9c6deda5fdbaba389ee9f8a280ef419c311365 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sun, 26 Oct 2014 22:50:55 +0100
Subject: [PATCH 022/229] libllqtwebkit.dylib does not exist anymore.

---
 indra/cmake/Copy3rdPartyLibs.cmake | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 7c56bb6995..270cb42215 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -251,13 +251,6 @@ elseif(DARWIN)
         libgrowl++.dylib
        )
 
-    # <FS:ND> libllqtwebkit.dylib comes from a prebuild slplugin. It needs to be fetched from somewhere else
-	# when building x64/universal. Probably it's best to copy it in fs_viewer_manifest.py for those cases.
-    if( NOT ND_BUILD64BIT_ARCH )
-      set(release_files ${release_files} libllqtwebkit.dylib )
-    endif( NOT ND_BUILD64BIT_ARCH )
-	# </FS:ND>
-
     # <FS:ND> We only ever need google breakpad when crash reporting is used
     if(RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING)
       set(release_files ${release_files} "libexception_handler.dylib")

From 577d2cfa91ee204ef444ec63ff08e0c9c1fe04a2 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Mon, 27 Oct 2014 01:18:37 +0100
Subject: [PATCH 023/229] Link against the static libllqtwebkit.

---
 indra/cmake/WebKitLibPlugin.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 58e7704612..0d62af5c8c 100755
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -53,8 +53,8 @@ if (WINDOWS)
     )
 elseif (DARWIN)
     set(WEBKIT_PLUGIN_LIBRARIES
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
-        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.a
+        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.a
         )
 elseif (LINUX)
     # FIRE-6108, add missing if clause for standalone builds - TL

From dcb1c4affb26dc99c157f1eba4dbe4bffbc8059b Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Mon, 27 Oct 2014 19:37:40 -0700
Subject: [PATCH 024/229] Fixing up webkit entries for OSX building. Picked
 appart from
 http://hg.secondlife.com/viewer-release/commits/9caf01e9cd3efc4d38503b9f8b5329685e45d8f1

---
 indra/cmake/WebKitLibPlugin.cmake         |  8 ++++--
 indra/media_plugins/webkit/CMakeLists.txt | 12 ++++-----
 indra/newview/viewer_manifest.py          | 33 +++++++++++++++++++++--
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 0d62af5c8c..769bd89764 100755
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -53,8 +53,12 @@ if (WINDOWS)
     )
 elseif (DARWIN)
     set(WEBKIT_PLUGIN_LIBRARIES
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.a
-        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.a
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.a
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libQtWebKit.4.dylib
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libQtOpenGL.4.dylib
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libQtNetwork.4.dylib
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libQtGui.4.dylib
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libQtCore.4.dylib
         )
 elseif (LINUX)
     # FIRE-6108, add missing if clause for standalone builds - TL
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt
index 0c1c3d800e..1aa70d4e3b 100755
--- a/indra/media_plugins/webkit/CMakeLists.txt
+++ b/indra/media_plugins/webkit/CMakeLists.txt
@@ -121,12 +121,12 @@ if (DARWIN)
   )
 
   # copy the webkit dylib to the build directory
-  add_custom_command(
-    TARGET media_plugin_webkit POST_BUILD
-#    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib
-    COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
-    DEPENDS media_plugin_webkit ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
-    )
+#   add_custom_command(
+#     TARGET media_plugin_webkit POST_BUILD
+# #    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib
+#     COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
+#    DEPENDS media_plugin_webkit ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
+#     )
     
 endif (DARWIN)
 
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index f0240c6357..01372ed1ad 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -959,13 +959,42 @@ class DarwinManifest(ViewerManifest):
                         symlinkf(os.path.join(os.pardir, os.pardir, os.pardir, libfile),
                                  os.path.join(resource_path, libfile))
 
-                # plugins
+                # SLPlugin.app/Contents/Resources gets those Qt4 libraries it needs.
+                if self.prefix(src="", dst="SLPlugin.app/Contents/Resources"):
+                    for libfile in ('libQtCore.4.dylib',
+                                    'libQtCore.4.7.1.dylib',
+                                    'libQtGui.4.dylib',
+                                    'libQtGui.4.7.1.dylib',
+                                    'libQtNetwork.4.dylib',
+                                    'libQtNetwork.4.7.1.dylib',
+                                    'libQtOpenGL.4.dylib',
+                                    'libQtOpenGL.4.7.1.dylib',
+                                    'libQtSvg.4.dylib',
+                                    'libQtSvg.4.7.1.dylib',
+                                    'libQtWebKit.4.dylib',
+                                    'libQtWebKit.4.7.1.dylib',
+                                    'libQtXml.4.dylib',
+                                    'libQtXml.4.7.1.dylib'):
+                        self.path2basename("../packages/lib/release", libfile)
+                    self.end_prefix("SLPlugin.app/Contents/Resources")
+
+                # Qt4 codecs go to llplugin.  Not certain why but this is the first
+                # location probed according to dtruss so we'll go with that.
+                if self.prefix(src="../packages/plugins/codecs/", dst="llplugin/codecs"):
+                    self.path("libq*.dylib")
+                    self.end_prefix("llplugin/codecs")
+
+                # Similarly for imageformats.
+                if self.prefix(src="../packages/plugins/imageformats/", dst="llplugin/imageformats"):
+                    self.path("libq*.dylib")
+                    self.end_prefix("llplugin/imageformats")
+
+                # SLPlugin plugins proper
                 if self.prefix(src="", dst="llplugin"):
                     self.path2basename("../media_plugins/quicktime/" + self.args['configuration'],
                                        "media_plugin_quicktime.dylib")
                     self.path2basename("../media_plugins/webkit/" + self.args['configuration'],
                                        "media_plugin_webkit.dylib")
-                    self.path2basename("../packages/lib/release", "libllqtwebkit.dylib")
 
                     self.end_prefix("llplugin")
 

From 16bafd90805e60c5e0a139dc95b21d299f1ef4a0 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 28 Oct 2014 11:51:27 +0100
Subject: [PATCH 025/229] Move tip to default branch.

---
 README_BUILD_FIRESTORM_WIN64.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README_BUILD_FIRESTORM_WIN64.txt b/README_BUILD_FIRESTORM_WIN64.txt
index 6995ad2313..df7f07d443 100755
--- a/README_BUILD_FIRESTORM_WIN64.txt
+++ b/README_BUILD_FIRESTORM_WIN64.txt
@@ -21,3 +21,4 @@ autobuild -m64 configure -c ReleaseFS -- --chan <channel> --package -DFS_UPGRADE
 autobuild -m64 build -c ReleaseFS --no_configure
 
 The resulting installer/exe gets created in build-vc100_x64/newview/Release
+

From caa86284e17e2b95b2df92824a26f931ea5f344e Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 27 Aug 2014 00:04:47 -0400
Subject: [PATCH 026/229] Ctrl-Backspace and Ctrl-Delete for removing whole
 words when editing text

---
 indra/llui/lllineeditor.cpp | 39 +++++++++++++++++++++++++++++++++-
 indra/llui/lllineeditor.h   |  1 +
 indra/llui/lltexteditor.cpp | 42 ++++++++++++++++++++++++++++++++++++-
 indra/llui/lltexteditor.h   |  1 +
 4 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index eb35f767c0..0f0992a659 100755
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -933,6 +933,32 @@ void LLLineEditor::removeChar()
 	}
 }
 
+// Remove a word (set of characters up to next space/punctuation) from the text
+void LLLineEditor::removeWord(bool prev)
+{
+	const U32 pos(getCursor());
+	if (prev ? pos > 0 : static_cast<S32>(pos) < getLength())
+	{
+		U32 new_pos(prev ? prevWordPos(pos) : nextWordPos(pos));
+		if (new_pos == pos) // Other character we don't jump over
+			new_pos = prev ? prevWordPos(new_pos-1) : nextWordPos(new_pos+1);
+
+		const U32 diff(labs(pos - new_pos));
+		if (prev)
+		{
+			mText.erase(new_pos, diff);
+			setCursor(new_pos);
+		}
+		else
+		{
+			mText.erase(pos, diff);
+		}
+	}
+	else
+	{
+		LLUI::reportBadKeystroke();
+	}
+}
 
 void LLLineEditor::addChar(const llwchar uni_char)
 {
@@ -1381,7 +1407,10 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
 			else
 			if( 0 < getCursor() )
 			{
-				removeChar();
+				if (mask == MASK_CONTROL)
+					removeWord(true);
+				else
+					removeChar();
 			}
 			else
 			{
@@ -1391,6 +1420,14 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
 		handled = TRUE;
 		break;
 
+	case KEY_DELETE:
+		if (!mReadOnly && mask == MASK_CONTROL)
+		{
+			removeWord(false);
+			handled = true;
+		}
+		break;
+
 	case KEY_PAGE_UP:
 	case KEY_HOME:
 		if (!mIgnoreArrowKeys)
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h
index 1ab5d25346..420f896535 100755
--- a/indra/llui/lllineeditor.h
+++ b/indra/llui/lllineeditor.h
@@ -285,6 +285,7 @@ private:
 	void                    pasteHelper(bool is_primary);
 
 	void			removeChar();
+	void			removeWord(bool prev);
 	void			addChar(const llwchar c);
 	void			setCursorAtLocalPos(S32 local_mouse_x);
 	S32				findPixelNearestPos(S32 cursor_offset = 0) const;
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 119c92081e..3faa059db9 100755
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -1122,6 +1122,33 @@ void LLTextEditor::removeChar()
 	}
 }
 
+// Remove a word (set of characters up to next space/punctuation) from the text
+void LLTextEditor::removeWord(bool prev)
+{
+	const U32 pos(mCursorPos);
+	if (prev ? pos > 0 : static_cast<S32>(pos) < getLength())
+	{
+		U32 new_pos(prev ? prevWordPos(pos) : nextWordPos(pos));
+		if (new_pos == pos) // Other character we don't jump over
+			new_pos = prev ? prevWordPos(new_pos-1) : nextWordPos(new_pos+1);
+
+		const U32 diff(labs(pos - new_pos));
+		if (prev)
+		{
+			remove(new_pos, diff, false);
+			setCursorPos(new_pos);
+		}
+		else
+		{
+			remove(pos, diff, false);
+		}
+	}
+	else
+	{
+		LLUI::reportBadKeystroke();
+	}
+}
+
 // Add a single character to the text
 S32 LLTextEditor::addChar(S32 pos, llwchar wc)
 {
@@ -1717,7 +1744,10 @@ BOOL LLTextEditor::handleSpecialKey(const KEY key, const MASK mask)
 		else
 		if( 0 < mCursorPos )
 		{
-			removeCharOrTab();
+			if (mask == MASK_CONTROL)
+				removeWord(true);
+			else
+				removeCharOrTab();
 		}
 		else
 		{
@@ -1725,6 +1755,16 @@ BOOL LLTextEditor::handleSpecialKey(const KEY key, const MASK mask)
 		}
 		break;
 
+	case KEY_DELETE:
+		if (getEnabled() && mask == MASK_CONTROL)
+		{
+			removeWord(false);
+		}
+		else
+		{
+			handled = false;
+		}
+		break;
 
 	case KEY_RETURN:
 		if (mask == MASK_NONE)
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index d0d3b1e404..cc5f9d0aaf 100755
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -262,6 +262,7 @@ protected:
 	S32				overwriteChar(S32 pos, llwchar wc);
 	void			removeChar();
 	S32 			removeChar(S32 pos);
+	void			removeWord(bool prev);
 	S32				insert(S32 pos, const LLWString &wstr, bool group_with_next_op, LLTextSegmentPtr segment);
 	S32				remove(S32 pos, S32 length, bool group_with_next_op);
 	

From 00bfbfae2bca607b693ddea64af85bbed5b3b337 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 28 Oct 2014 22:39:16 +0100
Subject: [PATCH 027/229] Tag Firestorm-specific code in last commit

---
 indra/llui/lllineeditor.cpp | 7 +++++++
 indra/llui/lllineeditor.h   | 1 +
 indra/llui/lltexteditor.cpp | 7 +++++++
 indra/llui/lltexteditor.h   | 1 +
 4 files changed, 16 insertions(+)

diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 0f0992a659..8e2edc8d38 100755
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -933,6 +933,7 @@ void LLLineEditor::removeChar()
 	}
 }
 
+// <FS> Ctrl-Backspace remove word
 // Remove a word (set of characters up to next space/punctuation) from the text
 void LLLineEditor::removeWord(bool prev)
 {
@@ -959,6 +960,7 @@ void LLLineEditor::removeWord(bool prev)
 		LLUI::reportBadKeystroke();
 	}
 }
+// </FS>
 
 void LLLineEditor::addChar(const llwchar uni_char)
 {
@@ -1407,10 +1409,13 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
 			else
 			if( 0 < getCursor() )
 			{
+				// <FS> Ctrl-Backspace remove word
+				//removeChar();
 				if (mask == MASK_CONTROL)
 					removeWord(true);
 				else
 					removeChar();
+				// </FS>
 			}
 			else
 			{
@@ -1420,6 +1425,7 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
 		handled = TRUE;
 		break;
 
+	// <FS> Ctrl-Backspace remove word
 	case KEY_DELETE:
 		if (!mReadOnly && mask == MASK_CONTROL)
 		{
@@ -1427,6 +1433,7 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
 			handled = true;
 		}
 		break;
+	// </FS>
 
 	case KEY_PAGE_UP:
 	case KEY_HOME:
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h
index 420f896535..0b1d593219 100755
--- a/indra/llui/lllineeditor.h
+++ b/indra/llui/lllineeditor.h
@@ -285,6 +285,7 @@ private:
 	void                    pasteHelper(bool is_primary);
 
 	void			removeChar();
+	// <FS> Ctrl-Backspace remove word
 	void			removeWord(bool prev);
 	void			addChar(const llwchar c);
 	void			setCursorAtLocalPos(S32 local_mouse_x);
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 3faa059db9..8a7c124c22 100755
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -1122,6 +1122,7 @@ void LLTextEditor::removeChar()
 	}
 }
 
+// <FS> Ctrl-Backspace remove word
 // Remove a word (set of characters up to next space/punctuation) from the text
 void LLTextEditor::removeWord(bool prev)
 {
@@ -1148,6 +1149,7 @@ void LLTextEditor::removeWord(bool prev)
 		LLUI::reportBadKeystroke();
 	}
 }
+// </FS>
 
 // Add a single character to the text
 S32 LLTextEditor::addChar(S32 pos, llwchar wc)
@@ -1744,10 +1746,13 @@ BOOL LLTextEditor::handleSpecialKey(const KEY key, const MASK mask)
 		else
 		if( 0 < mCursorPos )
 		{
+			// <FS> Ctrl-Backspace remove word
+			//removeCharOrTab();
 			if (mask == MASK_CONTROL)
 				removeWord(true);
 			else
 				removeCharOrTab();
+			// </FS>
 		}
 		else
 		{
@@ -1755,6 +1760,7 @@ BOOL LLTextEditor::handleSpecialKey(const KEY key, const MASK mask)
 		}
 		break;
 
+	// <FS> Ctrl-Backspace remove word
 	case KEY_DELETE:
 		if (getEnabled() && mask == MASK_CONTROL)
 		{
@@ -1765,6 +1771,7 @@ BOOL LLTextEditor::handleSpecialKey(const KEY key, const MASK mask)
 			handled = false;
 		}
 		break;
+	// </FS>
 
 	case KEY_RETURN:
 		if (mask == MASK_NONE)
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index cc5f9d0aaf..e3effc8b80 100755
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -262,6 +262,7 @@ protected:
 	S32				overwriteChar(S32 pos, llwchar wc);
 	void			removeChar();
 	S32 			removeChar(S32 pos);
+	// <FS> Ctrl-Backspace remove word
 	void			removeWord(bool prev);
 	S32				insert(S32 pos, const LLWString &wstr, bool group_with_next_op, LLTextSegmentPtr segment);
 	S32				remove(S32 pos, S32 length, bool group_with_next_op);

From 7b49f699ffbb345357c63cbabb7a7fddbf92ee6e Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 28 Oct 2014 22:51:03 +0100
Subject: [PATCH 028/229] Fix Unicode handling in Windows error reporting.
 Thanks to Drake Arconis for pointing out

---
 indra/newview/llappviewerwin32.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 07e06c3fe6..7653054fb3 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -425,14 +425,25 @@ void LLAppViewerWin32::disableWinErrorReporting()
 		HINSTANCE fault_rep_dll_handle = LoadLibrary(L"faultrep.dll");		/* Flawfinder: ignore */
 		if( fault_rep_dll_handle )
 		{
-			pfn_ADDEREXCLUDEDAPPLICATIONA pAddERExcludedApplicationA  = (pfn_ADDEREXCLUDEDAPPLICATIONA) GetProcAddress(fault_rep_dll_handle, "AddERExcludedApplicationA");
-			if( pAddERExcludedApplicationA )
+			// <FS:Ansariel> Use unicode version
+			//pfn_ADDEREXCLUDEDAPPLICATIONA pAddERExcludedApplicationA  = (pfn_ADDEREXCLUDEDAPPLICATIONA) GetProcAddress(fault_rep_dll_handle, "AddERExcludedApplicationA");
+			//if( pAddERExcludedApplicationA )
+			//{
+
+			//	// Strip the path off the name
+			//	const char* executable_name = gDirUtilp->getExecutableFilename().c_str();
+
+			//	if( 0 == pAddERExcludedApplicationA( executable_name ) )
+			pfn_ADDEREXCLUDEDAPPLICATIONW pAddERExcludedApplicationW  = (pfn_ADDEREXCLUDEDAPPLICATIONW) GetProcAddress(fault_rep_dll_handle, "AddERExcludedApplicationW");
+			if( pAddERExcludedApplicationW )
 			{
 
 				// Strip the path off the name
-				const char* executable_name = gDirUtilp->getExecutableFilename().c_str();
+				std::string executable_name = gDirUtilp->getExecutableFilename();
+				llutf16string wstr = utf8str_to_utf16str(executable_name);
 
-				if( 0 == pAddERExcludedApplicationA( executable_name ) )
+				if( 0 == pAddERExcludedApplicationW( wstr.c_str() ) )
+			// </FS:Ansariel>
 				{
 					U32 error_code = GetLastError();
 					LL_INFOS() << "AddERExcludedApplication() failed with error code " << error_code << LL_ENDL;
@@ -465,8 +476,8 @@ void LLAppViewerWin32::disableWinErrorReporting()
 			if( pAddERExcludedApplicationW )
 			{
 				// Strip the path off the name
-				const char* executable_name = gDirUtilp->getExecutableFilename().c_str();
-				std::wstring wstr(executable_name, executable_name+strlen(executable_name));
+				std::string executable_name = gDirUtilp->getExecutableFilename();
+				llutf16string wstr = utf8str_to_utf16str(executable_name);
 
 				if( S_OK == pAddERExcludedApplicationW( wstr.c_str(), FALSE ) )
 				{

From c3173716e234f2456724c1074cb3d710fd32077e Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 14 Jul 2014 12:28:29 +0300
Subject: [PATCH 029/229] MAINT-4218 FIXED Adding clothing from inventory
 closes THAT clothing folder and hides THAT folder

---
 indra/llui/llfolderviewitem.cpp              | 14 ++++++++++----
 indra/newview/llfolderviewmodelinventory.cpp |  6 ++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index de10a5a665..991693aeba 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -1079,8 +1079,9 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
 	LL_RECORD_BLOCK_TIME(FTM_ARRANGE);
 
 	// evaluate mHasVisibleChildren
-	mHasVisibleChildren = false;
-	if (getViewModelItem()->descendantsPassedFilter())
+	bool default_filter = getRoot()->getFolderViewModel()->getFilter().isDefault();
+	mHasVisibleChildren = default_filter && (mItems.size() || mFolders.size());
+	if (!default_filter && getViewModelItem()->descendantsPassedFilter())
 	{
 		// We have to verify that there's at least one child that's not filtered out
 		bool found = false;
@@ -1131,7 +1132,12 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
 			for(folders_t::iterator fit = mFolders.begin(); fit != mFolders.end(); ++fit)
 			{
 				LLFolderViewFolder* folderp = (*fit);
-				folderp->setVisible(folderp->passedFilter()); // passed filter or has descendants that passed filter
+
+				// passedFilter() will show everything  that passed filter or has descendants that passed filter
+				// also it will hide all filter-pending folders (they will be shown later if needed).
+				// but since refreshed folders are 'pending', they can be rendered invisible by passedFilter()
+				// even if we are not using filter at the moment, default_filter is used to prevent it
+				folderp->setVisible(default_filter || folderp->passedFilter());
 
 				if (folderp->getVisible())
 				{
@@ -1150,7 +1156,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
 				iit != mItems.end(); ++iit)
 			{
 				LLFolderViewItem* itemp = (*iit);
-				itemp->setVisible(itemp->passedFilter());
+				itemp->setVisible(default_filter || itemp->passedFilter());
 
 				if (itemp->getVisible())
 				{
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp
index 7339398fa5..11d49ff784 100755
--- a/indra/newview/llfolderviewmodelinventory.cpp
+++ b/indra/newview/llfolderviewmodelinventory.cpp
@@ -129,13 +129,15 @@ void LLFolderViewModelItemInventory::requestSort()
 
 void LLFolderViewModelItemInventory::setPassedFilter(bool passed, S32 filter_generation, std::string::size_type string_offset, std::string::size_type string_size)
 {
+	bool init_state = getLastFilterGeneration() < 0;
 	LLFolderViewModelItemCommon::setPassedFilter(passed, filter_generation, string_offset, string_size);
 	bool before = mPrevPassedAllFilters;
 	mPrevPassedAllFilters = passedFilter(filter_generation);
 
-    if (before != mPrevPassedAllFilters)
+	if (before != mPrevPassedAllFilters || (init_state && before && !mFolderViewItem->getVisible()))
 	{
-        // Need to rearrange the folder if the filtered state of the item changed
+		// Need to rearrange the folder if the filtered state of the item changed
+		// or folder was hidden during update as filter-dirty (MAINT-4218)
 		LLFolderViewFolder* parent_folder = mFolderViewItem->getParentFolder();
 		if (parent_folder)
 		{

From 9046c7e8c92a31ee076ccbe3393302de04005159 Mon Sep 17 00:00:00 2001
From: andreylproductengine <andreylproductengine@lindenlab.com>
Date: Thu, 10 Apr 2014 07:05:34 +0300
Subject: [PATCH 030/229] MAINT-3846 FIXED I can only invite members to a group
 to the role of everyone...

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

diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
index 5dfa7f32b4..cd69a0e3f3 100755
--- a/indra/newview/llpanelgroupinvite.cpp
+++ b/indra/newview/llpanelgroupinvite.cpp
@@ -260,7 +260,7 @@ void LLPanelGroupInvite::impl::addRoleNames(LLGroupMgrGroupData* gdatap)
 			//else if they have the limited add to roles power
 			//we add every role the user is in
 			//else we just add to everyone
-			bool is_owner   = member_data->isInRole(gdatap->mOwnerRole);
+			bool is_owner   = member_data->isOwner();
 			bool can_assign_any = gAgent.hasPowerInGroup(mGroupID,
 												 GP_ROLE_ASSIGN_MEMBER);
 			bool can_assign_limited = gAgent.hasPowerInGroup(mGroupID,
@@ -581,7 +581,7 @@ void LLPanelGroupInvite::updateLists()
 		{
 			waiting = true;
 		}
-		if (gdatap->isRoleDataComplete() && gdatap->isMemberDataComplete()) 
+		if (gdatap->isRoleDataComplete() && gdatap->isMemberDataComplete() && gdatap->isRoleMemberDataComplete()) 
 		{
 			if ( mImplementation->mRoleNames )
 			{
@@ -609,6 +609,7 @@ void LLPanelGroupInvite::updateLists()
 		{
 			LLGroupMgr::getInstance()->sendGroupPropertiesRequest(mImplementation->mGroupID);
 			LLGroupMgr::getInstance()->sendGroupRoleDataRequest(mImplementation->mGroupID);
+			LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(mImplementation->mGroupID);
 			LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mImplementation->mGroupID);
 		}
 		mPendingUpdate = TRUE;

From fd4ede15ca2d4ef1a0cafbcd848d638ac91e7436 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 29 Oct 2014 02:19:35 +0100
Subject: [PATCH 031/229] Properly free signals in LLTextBase

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

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 33d9fb53e9..7085cbb8e5 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -301,7 +301,13 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
 LLTextBase::~LLTextBase()
 {
 	mSegments.clear();
-	delete mURLClickSignal;
+	// <FS:Ansariel> Properly free the signals
+	//delete mURLClickSignal;
+	if (mURLClickSignal)
+		delete mURLClickSignal;
+	if (mIsFriendSignal)
+		delete mIsFriendSignal;
+	// </FS:Ansariel>
 }
 
 void LLTextBase::initFromParams(const LLTextBase::Params& p)

From a48312b6023a10d29b7572d419bc404a18baa013 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 29 Oct 2014 02:26:00 +0100
Subject: [PATCH 032/229] I shouldn't do this at night...

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

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 7085cbb8e5..7ca054034b 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -301,12 +301,9 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
 LLTextBase::~LLTextBase()
 {
 	mSegments.clear();
+	delete mURLClickSignal;
 	// <FS:Ansariel> Properly free the signals
-	//delete mURLClickSignal;
-	if (mURLClickSignal)
-		delete mURLClickSignal;
-	if (mIsFriendSignal)
-		delete mIsFriendSignal;
+	delete mIsFriendSignal;
 	// </FS:Ansariel>
 }
 

From 59c8b3825f54c3672848eb66004b2588248c7c3e Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Wed, 29 Oct 2014 17:51:24 +0100
Subject: [PATCH 033/229] Move tip to default branch.

---
 README_BUILD_FIRESTORM_WIN64.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README_BUILD_FIRESTORM_WIN64.txt b/README_BUILD_FIRESTORM_WIN64.txt
index df7f07d443..118684f113 100755
--- a/README_BUILD_FIRESTORM_WIN64.txt
+++ b/README_BUILD_FIRESTORM_WIN64.txt
@@ -1,7 +1,7 @@
 This is WIP. Please change/expand when seeing fit.
 
 1.1 Visual Studio 2010 Pro or better with installed 64 bit compiler.
-1.2 Or Visual Studio Express and 'Microsoft Windows SDK for Windows 7 and .NET Framework 4'. Make sure to install at least the header and compiler.
+1.2 Or Visual Studio Express and 'Microsoft Windows SDK for Windows 7 and .NET Framework 4'. Make sure to install at least the header and compiler with all the latest service packs.
 2. autobuild from https://bitbucket.org/NickyD/autobuild
 3. FMOD, if you want sound, please see https://bitbucket.org/NickyD/3p-fmodex
 

From 0bc147c956764914d81c055b767d4f53ba6748e0 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 29 Oct 2014 19:29:40 +0100
Subject: [PATCH 034/229] Set Vivox log path everywhere necessary

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

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 224ae57593..be8e35dea9 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -479,7 +479,14 @@ bool LLVivoxVoiceClient::writeString(const std::string &str)
 void LLVivoxVoiceClient::connectorCreate()
 {
 	std::ostringstream stream;
-	std::string logpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
+	// <FS:Ansariel> Set custom Vivox log path everywhere necessary
+	//std::string logpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
+	std::string logpath = gSavedSettings.getString("VivoxLogDirectory");
+	if (logpath.empty())
+	{
+		logpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
+	}
+	// </FS:Ansariel>
 	std::string loglevel = "0";
 	
 	// Transition to stateConnectorStarted when the connector handle comes back.

From 32f77d385b54d74e3f8a1ce53823cacf8c9cb54b Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 29 Oct 2014 22:50:23 +0100
Subject: [PATCH 035/229] FIRE-14864: Strip trailing delimiter from custom
 Vivox log path or APR will complain

---
 indra/newview/llvoicevivox.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index be8e35dea9..4a0d958849 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -486,6 +486,10 @@ void LLVivoxVoiceClient::connectorCreate()
 	{
 		logpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
 	}
+	else if (LLStringUtil::endsWith(logpath, gDirUtilp->getDirDelimiter()))
+	{
+		logpath = logpath.substr(0, logpath.size() - gDirUtilp->getDirDelimiter().size());
+	}
 	// </FS:Ansariel>
 	std::string loglevel = "0";
 	
@@ -830,6 +834,12 @@ void LLVivoxVoiceClient::stateMachine()
                         {
                             log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
                         }
+						// <FS:Ansariel> Strip trailing directory delimiter
+						else if (LLStringUtil::endsWith(log_folder, gDirUtilp->getDirDelimiter()))
+						{
+							log_folder = log_folder.substr(0, log_folder.size() - gDirUtilp->getDirDelimiter().size());
+						}
+						// </FS:Ansariel>
                         
 						params.args.add("-lf");
 						params.args.add(log_folder);

From 65144498b10cf6f1ea875c3950e0c6eff4635957 Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Thu, 30 Oct 2014 23:21:49 +0100
Subject: [PATCH 036/229] FIRE-6616 - Add locking option to the toolbars to
 prevent accidental moving or deleting of buttons.

---
 indra/newview/app_settings/settings.xml       | 11 ++++++++++
 indra/newview/lltoolbarview.cpp               | 21 +++++++++++++++++++
 .../skins/default/xui/en/floater_toybox.xml   | 13 ++++++++++++
 .../skins/default/xui/en/menu_toolbars.xml    | 11 +++++++++-
 .../xui/en/menu_toolbars_horizontal.xml       | 11 +++++++++-
 .../default/xui/en/menu_toolbars_vertical.xml | 11 +++++++++-
 6 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0dec7fb4fd..576bd7a2b4 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -19926,6 +19926,17 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>LockToolbars</key>
+  <map>
+    <key>Comment</key>
+    <string>If enabled, toolbars are locked and buttons can not be dragged around, added or removed.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>FSSkinClobbersToolbarPrefs</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index ac30b635ea..b90171338b 100755
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -629,6 +629,13 @@ void LLToolBarView::draw()
 
 void LLToolBarView::startDragTool(S32 x, S32 y, LLToolBarButton* toolbarButton)
 {
+	// <FS:Zi> Do not drag and drop when toolbars are locked
+	if(gSavedSettings.getBOOL("LockToolbars"))
+	{
+		return;
+	}
+	// </FS:Zi>
+
 	resetDragTool(toolbarButton);
 
 	// Flag the tool dragging but don't start it yet
@@ -637,6 +644,13 @@ void LLToolBarView::startDragTool(S32 x, S32 y, LLToolBarButton* toolbarButton)
 
 BOOL LLToolBarView::handleDragTool( S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type)
 {
+	// <FS:Zi> Do not drag and drop when toolbars are locked
+	if(gSavedSettings.getBOOL("LockToolbars"))
+	{
+		return FALSE;
+	}
+	// </FS:Zi>
+
 	if (LLToolDragAndDrop::getInstance()->isOverThreshold( x, y ))
 	{
 		if (!gToolBarView->mDragStarted)
@@ -670,6 +684,13 @@ BOOL LLToolBarView::handleDragTool( S32 x, S32 y, const LLUUID& uuid, LLAssetTyp
 
 BOOL LLToolBarView::handleDropTool( void* cargo_data, S32 x, S32 y, LLToolBar* toolbar)
 {
+	// <FS:Zi> Do not drag and drop when toolbars are locked
+	if(gSavedSettings.getBOOL("LockToolbars"))
+	{
+		return FALSE;
+	}
+	// </FS:Zi>
+
 	BOOL handled = FALSE;
 	LLInventoryObject* inv_item = static_cast<LLInventoryObject*>(cargo_data);
 	
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index 78623c875a..ddfe614f2f 100755
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -91,6 +91,7 @@
     height="23"
     label="Clear all toolbars"
     label_selected="Clear all toolbars"
+    disabled_control="LockToolbars"
     layout="topleft"
     left="185"
     name="btn_clear_all"
@@ -103,6 +104,7 @@
     height="23"
     label="Restore defaults"
     label_selected="Restore defaults"
+    disabled_control="LockToolbars"
     layout="topleft"
     left="335"
     name="btn_restore_defaults"
@@ -110,4 +112,15 @@
     width="130">
     <button.commit_callback function="Toybox.RestoreDefaults" />
   </button>
+  <check_box
+    follows="left|bottom|right"
+    height="23"
+    label="Locked"
+    layout="topleft"
+    left_pad="16"
+    name="check_toolbars_locked"
+    control_name="LockToolbars"
+    tool_tip="Check this box to lock the toolbars, so the buttons can't be dragged or removed by accident."
+    width="130">
+  </check_box>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
index 6e4f115569..468976ca3b 100755
--- a/indra/newview/skins/default/xui/en/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml
@@ -8,10 +8,11 @@
       visible="false">
   <menu_item_call label="Remove this button"
                   layout="topleft"
+                  invisibility_control="LockToolbars"
                   name="Remove button">
     <menu_item_call.on_click function="Toolbars.RemoveSelectedCommand" />
   </menu_item_call>
-  <menu_item_separator layout="topleft" />
+  <menu_item_separator layout="topleft" invisibility_control="LockToolbars" />
   <menu_item_call label="Toolbar buttons..."
                   layout="topleft"
                   name="Choose Buttons">
@@ -35,4 +36,12 @@
     <on_check function="Toolbars.CheckSetting"
               parameter="icons_only" />
   </menu_item_check>
+  <menu_item_separator layout="topleft" />
+  <menu_item_check label="Locked"
+                   layout="topleft"
+                   name="toolbars_locked">
+    <on_check  control="LockToolbars" />
+    <on_click  function="ToggleControl"
+               parameter="LockToolbars" />
+  </menu_item_check>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars_horizontal.xml b/indra/newview/skins/default/xui/en/menu_toolbars_horizontal.xml
index 24d29cdc28..336e7bae8d 100644
--- a/indra/newview/skins/default/xui/en/menu_toolbars_horizontal.xml
+++ b/indra/newview/skins/default/xui/en/menu_toolbars_horizontal.xml
@@ -6,10 +6,11 @@
       visible="false">
   <menu_item_call label="Remove this button"
                   layout="topleft"
+                  invisibility_control="LockToolbars"
                   name="Remove button">
     <menu_item_call.on_click function="Toolbars.RemoveSelectedCommand" />
   </menu_item_call>
-  <menu_item_separator layout="topleft" />
+  <menu_item_separator layout="topleft" invisibility_control="LockToolbars" />
   <menu_item_call label="Toolbar buttons..."
                   layout="topleft"
                   name="Choose Buttons">
@@ -91,4 +92,12 @@
     <on_check function="Toolbars.CheckLayoutStyle"
               parameter="fill" />
   </menu_item_check>
+  <menu_item_separator layout="topleft" />
+  <menu_item_check label="Locked"
+                   layout="topleft"
+                   name="toolbars_locked">
+    <on_check control="LockToolbars" />
+    <on_click function="ToggleControl"
+              parameter="LockToolbars" />
+  </menu_item_check>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars_vertical.xml b/indra/newview/skins/default/xui/en/menu_toolbars_vertical.xml
index 90c420d0e8..48b10f1b1a 100644
--- a/indra/newview/skins/default/xui/en/menu_toolbars_vertical.xml
+++ b/indra/newview/skins/default/xui/en/menu_toolbars_vertical.xml
@@ -6,10 +6,11 @@
       visible="false">
   <menu_item_call label="Remove this button"
                   layout="topleft"
+                  invisibility_control="LockToolbars"
                   name="Remove button">
     <menu_item_call.on_click function="Toolbars.RemoveSelectedCommand" />
   </menu_item_call>
-  <menu_item_separator layout="topleft" />
+  <menu_item_separator layout="topleft" invisibility_control="LockToolbars" />
   <menu_item_call label="Toolbar buttons..."
                   layout="topleft"
                   name="Choose Buttons">
@@ -66,4 +67,12 @@
     <on_check function="Toolbars.CheckSetting"
               parameter="text_only" />
   </menu_item_check>
+  <menu_item_separator layout="topleft" />
+  <menu_item_check label="Locked"
+                   layout="topleft"
+                   name="toolbars_locked">
+    <on_check control="LockToolbars" />
+    <on_click function="ToggleControl"
+              parameter="LockToolbars" />
+  </menu_item_check>
 </context_menu>

From ed465c616b840439cba1973e8111f22bf0b6a2a6 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 30 Oct 2014 23:46:46 +0100
Subject: [PATCH 037/229] Updated German translation

---
 indra/newview/skins/default/xui/de/floater_toybox.xml           | 1 +
 indra/newview/skins/default/xui/de/menu_toolbars.xml            | 1 +
 indra/newview/skins/default/xui/de/menu_toolbars_horizontal.xml | 1 +
 indra/newview/skins/default/xui/de/menu_toolbars_vertical.xml   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/indra/newview/skins/default/xui/de/floater_toybox.xml b/indra/newview/skins/default/xui/de/floater_toybox.xml
index 4a91f4a941..c9ea85f0f8 100755
--- a/indra/newview/skins/default/xui/de/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/de/floater_toybox.xml
@@ -8,4 +8,5 @@
 	</text>
 	<button label="Alle Symbolleisten leeren" label_selected="Alle Symbolleisten leeren" name="btn_clear_all" left="165" width="150"/>
 	<button label="Standards wiederherstellen" label_selected="Standards wiederherstellen" name="btn_restore_defaults" width="160"/>
+	<check_box label="Gesperrt" name="check_toolbars_locked" tool_tip="Falls aktiviert werden die Toolbars gesperrt, so dass Buttons nicht mehr verschoben oder entfernt werden können."/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/menu_toolbars.xml b/indra/newview/skins/default/xui/de/menu_toolbars.xml
index 3fb48e26b2..ca15f00b54 100755
--- a/indra/newview/skins/default/xui/de/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/de/menu_toolbars.xml
@@ -4,4 +4,5 @@
 	<menu_item_call label="Symbolleistenschaltflächen..." name="Choose Buttons"/>
 	<menu_item_check label="Symbole und Beschriftungen" name="icons_with_text"/>
 	<menu_item_check label="Nur Symbole" name="icons_only"/>
+	<menu_item_check label="Gesperrt" name="toolbars_locked"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_toolbars_horizontal.xml b/indra/newview/skins/default/xui/de/menu_toolbars_horizontal.xml
index 2e2bf6e2c6..bb46cf91f6 100644
--- a/indra/newview/skins/default/xui/de/menu_toolbars_horizontal.xml
+++ b/indra/newview/skins/default/xui/de/menu_toolbars_horizontal.xml
@@ -11,4 +11,5 @@
 	<menu_item_check label="Buttons mit automatische Breite" name="layout_style_none"/>
 	<menu_item_check label="Buttons mit fester Breite" name="layout_style_equalize"/>
 	<menu_item_check label="Buttons füllen Buttonleiste" name="layout_style_fill"/>
+	<menu_item_check label="Gesperrt" name="toolbars_locked"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_toolbars_vertical.xml b/indra/newview/skins/default/xui/de/menu_toolbars_vertical.xml
index 5f1daa153e..5467e2ce0a 100644
--- a/indra/newview/skins/default/xui/de/menu_toolbars_vertical.xml
+++ b/indra/newview/skins/default/xui/de/menu_toolbars_vertical.xml
@@ -8,4 +8,5 @@
 	<menu_item_check label="Symbole und Beschriftungen" name="icons_with_text"/>
 	<menu_item_check label="Nur Symbole" name="icons_only"/>
 	<menu_item_check label="Nur Beschriftungen" name="text_only"/>
+	<menu_item_check label="Gesperrt" name="toolbars_locked"/>
 </context_menu>

From a718fa91fc3f0bd29a13e055eb8b58c4dc826e16 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 21 May 2014 12:11:34 +0300
Subject: [PATCH 038/229] MAINT-4064 FIXED Don't show Folder arrow for folders
 without visible children.

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

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 991693aeba..51c8f4c317 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -722,7 +722,7 @@ void LLFolderViewItem::drawOpenFolderArrow(const Params& default_params, const L
 	//
 	const S32 TOP_PAD = default_params.item_top_pad;
 
-	if (hasVisibleChildren() || getViewModelItem()->hasChildren())
+	if (hasVisibleChildren())
 	{
 		LLUIImage* arrow_image = default_params.folder_arrow_image;
 		gl_draw_scaled_rotated_image(

From 4cb5bad705ec307660632597f49d0dcc76a9d4fc Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 29 Jul 2014 17:55:06 +0300
Subject: [PATCH 039/229] MAINT-4289 FIXED [BEAR] Recent Items "Reset Filters"
 not working correctly reverted and remade MAINT-4218

---
 indra/llui/llfolderviewitem.cpp              | 38 +++++++++++++-------
 indra/llui/llfolderviewitem.h                |  1 +
 indra/newview/llfolderviewmodelinventory.cpp |  4 +--
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 51c8f4c317..ad87460ffb 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -275,6 +275,24 @@ BOOL LLFolderViewItem::passedFilter(S32 filter_generation)
 	return getViewModelItem()->passedFilter(filter_generation);
 }
 
+BOOL LLFolderViewItem::isPotentiallyVisible(S32 filter_generation)
+{
+	// Item should be visible if:
+	// 1. item passed current filter
+	// 2. item was updated (gen < 0) but has descendants that passed filter
+	// 3. item was recently updated and was visible before update
+
+	LLFolderViewModelItem* model = getViewModelItem();
+	if (model->getLastFilterGeneration() < 0)
+	{
+		return model->descendantsPassedFilter(filter_generation) || getVisible();
+	}
+	else
+	{
+		return model->passedFilter(filter_generation);
+	}
+}
+
 void LLFolderViewItem::refresh()
 {
 	LLFolderViewModelItem& vmi = *getViewModelItem();
@@ -1077,11 +1095,10 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
 	getRoot()->getFolderViewModel()->sort(this);
 
 	LL_RECORD_BLOCK_TIME(FTM_ARRANGE);
-
+	
 	// evaluate mHasVisibleChildren
-	bool default_filter = getRoot()->getFolderViewModel()->getFilter().isDefault();
-	mHasVisibleChildren = default_filter && (mItems.size() || mFolders.size());
-	if (!default_filter && getViewModelItem()->descendantsPassedFilter())
+	mHasVisibleChildren = false;
+	if (getViewModelItem()->descendantsPassedFilter())
 	{
 		// We have to verify that there's at least one child that's not filtered out
 		bool found = false;
@@ -1089,7 +1106,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
 		for (items_t::iterator iit = mItems.begin(); iit != mItems.end(); ++iit)
 		{
 			LLFolderViewItem* itemp = (*iit);
-			found = itemp->passedFilter();
+			found = itemp->isPotentiallyVisible();
 			if (found)
 				break;
 		}
@@ -1099,7 +1116,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
 			for (folders_t::iterator fit = mFolders.begin(); fit != mFolders.end(); ++fit)
 			{
 				LLFolderViewFolder* folderp = (*fit);
-				found = folderp->passedFilter();
+				found = folderp->isPotentiallyVisible();
 				if (found)
 					break;
 			}
@@ -1132,12 +1149,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
 			for(folders_t::iterator fit = mFolders.begin(); fit != mFolders.end(); ++fit)
 			{
 				LLFolderViewFolder* folderp = (*fit);
-
-				// passedFilter() will show everything  that passed filter or has descendants that passed filter
-				// also it will hide all filter-pending folders (they will be shown later if needed).
-				// but since refreshed folders are 'pending', they can be rendered invisible by passedFilter()
-				// even if we are not using filter at the moment, default_filter is used to prevent it
-				folderp->setVisible(default_filter || folderp->passedFilter());
+				folderp->setVisible(folderp->isPotentiallyVisible());
 
 				if (folderp->getVisible())
 				{
@@ -1156,7 +1168,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
 				iit != mItems.end(); ++iit)
 			{
 				LLFolderViewItem* itemp = (*iit);
-				itemp->setVisible(default_filter || itemp->passedFilter());
+				itemp->setVisible(itemp->isPotentiallyVisible());
 
 				if (itemp->getVisible())
 				{
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index af835054db..4f3f26934f 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -263,6 +263,7 @@ public:
 	S32				getIndentation() { return mIndentation; }
 
 	virtual BOOL	passedFilter(S32 filter_generation = -1);
+	virtual BOOL	isPotentiallyVisible(S32 filter_generation = -1);
 
 	// refresh information from the object being viewed.
 	virtual void refresh();
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp
index 11d49ff784..7615c12043 100755
--- a/indra/newview/llfolderviewmodelinventory.cpp
+++ b/indra/newview/llfolderviewmodelinventory.cpp
@@ -129,15 +129,13 @@ void LLFolderViewModelItemInventory::requestSort()
 
 void LLFolderViewModelItemInventory::setPassedFilter(bool passed, S32 filter_generation, std::string::size_type string_offset, std::string::size_type string_size)
 {
-	bool init_state = getLastFilterGeneration() < 0;
 	LLFolderViewModelItemCommon::setPassedFilter(passed, filter_generation, string_offset, string_size);
 	bool before = mPrevPassedAllFilters;
 	mPrevPassedAllFilters = passedFilter(filter_generation);
 
-	if (before != mPrevPassedAllFilters || (init_state && before && !mFolderViewItem->getVisible()))
+	if (before != mPrevPassedAllFilters)
 	{
 		// Need to rearrange the folder if the filtered state of the item changed
-		// or folder was hidden during update as filter-dirty (MAINT-4218)
 		LLFolderViewFolder* parent_folder = mFolderViewItem->getParentFolder();
 		if (parent_folder)
 		{

From f1c43f14b367e3526d32b02180b7286ea5e5c7cb Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Wed, 30 Jul 2014 18:39:50 +0300
Subject: [PATCH 040/229] MAINT-4218 Adding clothing from inventory closes THAT
 clothing folder and hides THAT folder fixed issue with 'yet to be started
 filter' and 'dirty-visible' item.

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

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index ad87460ffb..ace64311bf 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -283,7 +283,7 @@ BOOL LLFolderViewItem::isPotentiallyVisible(S32 filter_generation)
 	// 3. item was recently updated and was visible before update
 
 	LLFolderViewModelItem* model = getViewModelItem();
-	if (model->getLastFilterGeneration() < 0)
+	if (model->getLastFilterGeneration() < 0 && !getFolderViewModel()->getFilter().isModified())
 	{
 		return model->descendantsPassedFilter(filter_generation) || getVisible();
 	}

From 0486cf4cc00bd3f689b8406e330ca061f363d56f Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Fri, 31 Oct 2014 22:08:34 +0100
Subject: [PATCH 041/229] Updated Polish translation

---
 .../skins/default/xui/pl/floater_font_test.xml   |  6 +-----
 .../skins/default/xui/pl/floater_search.xml      | 16 ----------------
 .../skins/default/xui/pl/floater_toybox.xml      |  1 +
 .../skins/default/xui/pl/menu_toolbars.xml       |  1 +
 .../default/xui/pl/menu_toolbars_horizontal.xml  |  1 +
 .../default/xui/pl/menu_toolbars_vertical.xml    |  1 +
 .../default/xui/pl/outfit_accordion_tab.xml      |  4 ----
 7 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100755 indra/newview/skins/default/xui/pl/floater_search.xml
 delete mode 100755 indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml

diff --git a/indra/newview/skins/default/xui/pl/floater_font_test.xml b/indra/newview/skins/default/xui/pl/floater_font_test.xml
index 6dcc7f3163..95dd7a5677 100755
--- a/indra/newview/skins/default/xui/pl/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/pl/floater_font_test.xml
@@ -1,6 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="Czcionka tekstu">
-	<text name="linea">
-		OverrideTest, powinno wyświetlać się jako Times. (From default/xui/en-us)
-	</text>
-</floater>
+<floater name="contents" title="Test czcionki" />
diff --git a/indra/newview/skins/default/xui/pl/floater_search.xml b/indra/newview/skins/default/xui/pl/floater_search.xml
deleted file mode 100755
index cfe7f09438..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="Szukaj">
-	<floater.string name="loading_text">
-		Ładowanie...
-	</floater.string>
-	<floater.string name="done_text">
-		Wykonano
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="browser_layout">
-			<text name="refresh_search">
-				Ustaw wyszukiwanie na odzwierciedlanie poziomu boskiego
-			</text>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_toybox.xml b/indra/newview/skins/default/xui/pl/floater_toybox.xml
index 0f3887af9a..244aef8275 100644
--- a/indra/newview/skins/default/xui/pl/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/pl/floater_toybox.xml
@@ -8,4 +8,5 @@
   </text>
   <button label="Wyczyść paski" label_selected="Wyczyść paski" name="btn_clear_all" />
   <button label="Przywróć domyślne" label_selected="Przywróć domyślne" name="btn_restore_defaults" />
+  <check_box label="Zablokowane" name="check_toolbars_locked" tool_tip="Zaznacz, aby zablokować paski uniemożliwiając przypadkowe przesunięcie lub usunięcie przycisków." />
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/menu_toolbars.xml b/indra/newview/skins/default/xui/pl/menu_toolbars.xml
index eaa999f2c1..29eda28175 100644
--- a/indra/newview/skins/default/xui/pl/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/pl/menu_toolbars.xml
@@ -4,4 +4,5 @@
   <menu_item_call label="Przyciski na pasku..." name="Choose Buttons" />
   <menu_item_check label="Ikony i etykiety" name="icons_with_text" />
   <menu_item_check label="Tylko ikony" name="icons_only" />
+  <menu_item_check label="Zablokowane" name="toolbars_locked" />
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_toolbars_horizontal.xml b/indra/newview/skins/default/xui/pl/menu_toolbars_horizontal.xml
index f7d5ed4c60..2521caba92 100644
--- a/indra/newview/skins/default/xui/pl/menu_toolbars_horizontal.xml
+++ b/indra/newview/skins/default/xui/pl/menu_toolbars_horizontal.xml
@@ -11,4 +11,5 @@
   <menu_item_check label="Automatycznie dopasuj przyciski" name="layout_style_none" />
   <menu_item_check label="Stały rozmiar przycisków" name="layout_style_equalize" />
   <menu_item_check label="Przyciski wypełniają pasek" name="layout_style_fill" />
+  <menu_item_check label="Zablokowane" name="toolbars_locked" />
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_toolbars_vertical.xml b/indra/newview/skins/default/xui/pl/menu_toolbars_vertical.xml
index abf5dc6553..a7cc8df5e1 100644
--- a/indra/newview/skins/default/xui/pl/menu_toolbars_vertical.xml
+++ b/indra/newview/skins/default/xui/pl/menu_toolbars_vertical.xml
@@ -8,4 +8,5 @@
   <menu_item_check label="Ikony i etykiety" name="icons_with_text" />
   <menu_item_check label="Tylko ikony" name="icons_only" />
   <menu_item_check label="Tylko etykiety" name="text_only" />
+  <menu_item_check label="Zablokowane" name="toolbars_locked" />
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml
deleted file mode 100755
index bac885e5d8..0000000000
--- a/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- *NOTE: mantipov: this xml is intended to be used inside panel_outfits_list.xml for each outfit folder-->
-<!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtume-->
-<accordion_tab name="Mockup Tab" title="Mockup Tab"/>

From d5bc4a4a1aae480403dae04cb0acf1194b3c4635 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sat, 1 Nov 2014 23:50:31 +0100
Subject: [PATCH 042/229] Minor leftover cleanup in en/menu_viewer.xml

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 97a16c1ccc..f19054d3af 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -4614,7 +4614,6 @@
                  function="ToggleControl"
                  parameter="DebugAvatarRotation" />
             </menu_item_check> -->
--->
             <menu_item_call
              label="Dump Attachments"
              name="Dump Attachments">

From 439eb9dba73138e040dc9894034a295a13765c79 Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sat, 1 Nov 2014 23:10:32 -0700
Subject: [PATCH 043/229] Latency: Fixed group name visiblity on group notices.
 Changed colors from black on blue to light-gray on dark-gray This was the
 quicker, simpler fix for link visiablity on light colored backgrounds.

---
 indra/newview/skins/latency/colors.xml            |  6 +++---
 .../skins/latency/xui/en/panel_group_notify.xml   | 15 +++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/indra/newview/skins/latency/colors.xml b/indra/newview/skins/latency/colors.xml
index baad37ba3d..a6a031de1e 100644
--- a/indra/newview/skins/latency/colors.xml
+++ b/indra/newview/skins/latency/colors.xml
@@ -84,13 +84,13 @@
 		reference="drkgrey123" />
 	<color
 		name="GroupNotifyDialogBG"
-		reference="ScriptDialog" />
+		reference="drkgrey123" />
 	<color
 		name="GroupNotifyTextBG"
-		value="0.855 0.933 1.0 1.0" />
+		value="drkgrey123" />
 	<color
 		name="GroupNotifyTextColor"
-		reference="TextFgColor" />
+		reference="LtGray" />
 	<color
 		name="HighlightChildColor"
 		reference="Yellow" />
diff --git a/indra/newview/skins/latency/xui/en/panel_group_notify.xml b/indra/newview/skins/latency/xui/en/panel_group_notify.xml
index 82d09be379..16f409e94e 100644
--- a/indra/newview/skins/latency/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/latency/xui/en/panel_group_notify.xml
@@ -57,7 +57,7 @@
 		top_pad="2"
 		width="64" />
 	<text_editor
-		bg_readonly_color="GroupNotifyTextBG"
+		bg_readonly_color="Transparent"
 		border_visible="true"
 		parse_urls="true"
 		enabled="true"
@@ -90,27 +90,26 @@
 	<panel
 		name="attachment_container"
 		left_pad="4"
-		border_visible="true"
-		background_visible="true"
+		border_visible="false"
+		background_visible="false"
 		background_opaque="true"
-		bg_opaque_color="GroupNotifyTextBG"
 		follows="left|bottom|right"
-		height="15"
+		height="16"
 		layout="topleft"
 		right="-8">
 		<icon
 			top="0"
 			follows="left|top"
-			height="15"
+			height="16"
 			layout="topleft"
 			mouse_opaque="true"
 			name="attachment_icon"
-			width="15" />
+			width="16" />
 		<text
 			left_pad="5"
 			follows="left|right|top"
 			font="SansSerif"
-			height="15"
+			height="16"
 			layout="topleft"
 			name="attachment"
 			parse_urls="false"

From 5ed56b3d9e228c54c67bfd0e38fd6c118f23610b Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sun, 2 Nov 2014 02:53:45 -0800
Subject: [PATCH 044/229] Latency: Adjusted group notice layout some, and color
 name cleanup

---
 indra/newview/skins/latency/colors.xml        | 10 ++++----
 .../latency/xui/en/panel_group_notify.xml     | 24 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/indra/newview/skins/latency/colors.xml b/indra/newview/skins/latency/colors.xml
index a6a031de1e..bf83874dc3 100644
--- a/indra/newview/skins/latency/colors.xml
+++ b/indra/newview/skins/latency/colors.xml
@@ -83,14 +83,14 @@
 		name="ChatHistoryBgColor"
 		reference="drkgrey123" />
 	<color
-		name="GroupNotifyDialogBG"
+		name="NotifyDialogBG"
 		reference="drkgrey123" />
 	<color
-		name="GroupNotifyTextBG"
-		value="drkgrey123" />
+		name="NotifyTextBG"
+		reference="drkgrey123" />
 	<color
-		name="GroupNotifyTextColor"
-		reference="LtGray" />
+		name="NotifyTextColor"
+		reference="White" />
 	<color
 		name="HighlightChildColor"
 		reference="Yellow" />
diff --git a/indra/newview/skins/latency/xui/en/panel_group_notify.xml b/indra/newview/skins/latency/xui/en/panel_group_notify.xml
index 16f409e94e..3fccdf98e9 100644
--- a/indra/newview/skins/latency/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/latency/xui/en/panel_group_notify.xml
@@ -4,7 +4,7 @@
 	border_thickness="1"
 	background_visible="true"
 	background_opaque="true"
-	bg_opaque_color="GroupNotifyDialogBG"
+	bg_opaque_color="NotifyDialogBG"
 	height="260"
 	label="instant_message"
 	layout="topleft"
@@ -28,8 +28,8 @@
 		layout="topleft"
 		left="10"
 		name="group_notice"
-		text_color="GroupNotifyTextColor"
-		top_pad="15"
+		text_color="NotifyTextColor"
+		top_pad="5"
 		use_ellipses="true"
 		value="Group Notice"
 		width="380" />
@@ -41,8 +41,8 @@
 		layout="topleft"
 		left="10"
 		name="title"
-		text_color="GroupNotifyTextColor"
-		top_pad="2"
+		text_color="NotifyTextColor"
+		top_pad="4"
 		use_ellipses="true"
 		value="Sent by Sender Name, Group Name" 
 		width="380" />
@@ -54,7 +54,7 @@
 		left="5"
 		mouse_opaque="true"
 		name="group_icon"
-		top_pad="2"
+		top_pad="4"
 		width="64" />
 	<text_editor
 		bg_readonly_color="Transparent"
@@ -71,13 +71,13 @@
 		parse_highlights="true"
 		read_only="true"
 		right="-8"
-		text_readonly_color="GroupNotifyTextColor"
+		text_readonly_color="NotifyTextColor"
 		type="string"
 		use_ellipses="true"
 		value="message"
 		word_wrap="true" />
 	<text
-		top_pad="2"
+		top_pad="4"
 		follows="left|bottom"
 		font="SansSerif"
 		height="15"
@@ -85,11 +85,11 @@
 		name="attachment_label"
 		parse_urls="false"
 		width="60"
-		text_color="GroupNotifyTextColor"
+		text_color="NotifyTextColor"
 		value="Attached:" />
 	<panel
 		name="attachment_container"
-		left_pad="4"
+		left_pad="5"
 		border_visible="false"
 		background_visible="false"
 		background_opaque="true"
@@ -98,7 +98,7 @@
 		layout="topleft"
 		right="-8">
 		<icon
-			top="0"
+			top="1"
 			follows="left|top"
 			height="16"
 			layout="topleft"
@@ -114,7 +114,7 @@
 			name="attachment"
 			parse_urls="false"
 			right="-1"
-			text_color="GroupNotifyTextColor"
+			text_color="NotifyTextColor"
 			value="Attachment"
 			use_ellipses="true" />
 	</panel>

From 365c1f7433c8a1c5b7f60408844820d97a1b629d Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sun, 2 Nov 2014 02:55:31 -0800
Subject: [PATCH 045/229] Latency: Recolored script notices to white on
 dark-gray to fix link visablity. Same reasons as with group notices

---
 indra/newview/lltoastnotifypanel.cpp          |   2 +-
 .../skins/latency/xui/en/floater_script.xml   |   4 +-
 .../latency/xui/en/panel_notification.xml     | 114 ++++++++++++++++++
 .../xui/en/panel_notification_script.xml      |  87 +++++++++++++
 .../xui/en/panel_notifications_channel.xml    |  83 +++++++++++++
 .../latency/xui/en/panel_notify_textbox.xml   | 112 +++++++++++++++++
 6 files changed, 399 insertions(+), 3 deletions(-)
 create mode 100644 indra/newview/skins/latency/xui/en/panel_notification.xml
 create mode 100644 indra/newview/skins/latency/xui/en/panel_notification_script.xml
 create mode 100644 indra/newview/skins/latency/xui/en/panel_notifications_channel.xml
 create mode 100644 indra/newview/skins/latency/xui/en/panel_notify_textbox.xml

diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index c7183a715c..6204cd1b1c 100755
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -323,7 +323,7 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
 	mTextBox->setIsFriendCallback(LLAvatarActions::isFriend);
 
 	// <FS:Ansariel> Script dialog colors
-	if (mIsScriptDialog)
+	if (mIsScriptDialog && (gSavedSettings.getString("SkinCurrent") != "latency")) //<FS:Kadah> HAX: don't override skin's text color
 	{
 		LLColor4 script_dialog_fg_color = LLUIColorTable::instance().getColor("ScriptDialogFg", LLColor4::white).get();
 		mTextBox->setColor(script_dialog_fg_color);
diff --git a/indra/newview/skins/latency/xui/en/floater_script.xml b/indra/newview/skins/latency/xui/en/floater_script.xml
index cb3b8a8f18..d594742793 100644
--- a/indra/newview/skins/latency/xui/en/floater_script.xml
+++ b/indra/newview/skins/latency/xui/en/floater_script.xml
@@ -3,9 +3,9 @@
 	legacy_header_height="18"
 	background_visible="true"
 	bg_opaque_image="floater_script_background"
-	bg_opaque_image_overlay="ScriptDialog"
+	bg_opaque_image_overlay="NotifyDialogBG"
 	bg_alpha_image="floater_script_background"
-	bg_alpha_image_overlay="ScriptDialog"
+	bg_alpha_image_overlay="NotifyDialogBG"
 	drop_shadow="false"
 	follows="all"
 	height="250"
diff --git a/indra/newview/skins/latency/xui/en/panel_notification.xml b/indra/newview/skins/latency/xui/en/panel_notification.xml
new file mode 100644
index 0000000000..b5bb4a2954
--- /dev/null
+++ b/indra/newview/skins/latency/xui/en/panel_notification.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+  background_opaque="false"
+      border_visible="true"
+  background_visible="true"
+  bg_alpha_color="Cerise_0"
+  bg_opaque_color="Cerise_0"
+  label="notification_panel"
+  layout="topleft"
+  left="0"
+  name="notification_panel"
+  chrome="true"
+  top="0"
+  	height="140"
+  translate="false"
+  width="305">
+  <!-- THIS PANEL CONTROLS TOAST HEIGHT? -->
+  <panel
+      border_visible="false"
+ bevel_style="none"
+    background_visible="true"
+  bg_alpha_color="Titanium_0"
+  bg_opaque_color="Titanium_0"
+    follows="left|right|top"
+    height="100"
+    label="info_panel"
+    layout="topleft"
+    left="0"
+    name="info_panel"
+    top="0"
+    width="305">
+    <text
+      border_visible="false"
+      follows="left|right|top|bottom"
+      font="SansSerif"
+      height="85"
+      layout="topleft"
+      left="10"
+      name="text_box"
+      read_only="true"
+      text_color="NotifyTextColor"
+      top="10"
+      visible="false" 
+      width="285"
+      wrap="true"/>
+    <text
+      border_visible="false"
+      follows="left|right|top|bottom"
+      font="SansSerifBold"
+      height="85"
+      layout="topleft"
+      left="10"
+      name="caution_text_box"
+      text_color="NotifyCautionBoxColor"
+      top="10"
+      visible="false"
+      width="285"
+      wrap="true"/>
+    <text_editor
+    	h_pad="0"
+		v_pad="0"
+      bg_readonly_color="Transparent"
+      border_visible="false"
+      embedded_items="false"
+      enabled="false"
+      follows="left|right|top|bottom"
+      font="SansSerif"
+      height="85" 
+      layout="topleft"
+      left="10"
+      mouse_opaque="false"
+      name="text_editor_box"
+      read_only="true"
+      tab_stop="false"
+      text_color="NotifyTextColor"
+      text_readonly_color="NotifyTextColor"
+      top="10"
+      visible="true"
+	  value="Test."
+      width="285"
+      wrap="true"
+      parse_highlights="true"
+      parse_urls="true"/>
+  </panel>
+  <panel
+    background_visible="false"
+    follows="left|right|bottom"
+    height="30" 
+    width="290"
+    label="control_panel"
+    layout="topleft"
+    left="10"
+    name="control_panel"
+    top_pad="5">
+    <!-- 
+    Notes:
+    This panel holds buttons of notification. Change of its size can affect the layout of buttons. 
+     -->
+  </panel>
+
+  <!-- <FS:Zi> Dialog Stacking browser -->
+  <button
+    layout="topleft"
+    follows="right|bottom"
+    name="DialogStackButton"
+    visibility_control="DialogStackIconVisible"
+    image_selected="Icon_DialogStack"
+    image_unselected="Icon_DialogStack"   
+    width="24"
+    height="14"
+    right="-2"
+    bottom="-2" />
+  <!-- <FS:Zi> Dialog Stacking browser -->
+</panel>
diff --git a/indra/newview/skins/latency/xui/en/panel_notification_script.xml b/indra/newview/skins/latency/xui/en/panel_notification_script.xml
new file mode 100644
index 0000000000..b4fa1db9e9
--- /dev/null
+++ b/indra/newview/skins/latency/xui/en/panel_notification_script.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- lots of colors changed in this file -->
+<panel
+  background_opaque="false"
+  border_visible="false"
+  background_visible="false"
+  bg_alpha_color="NotifyDialogBG"
+  bg_opaque_color="NotifyDialogBG"
+  label="notification_panel"
+  layout="topleft"
+  left="0"
+  name="notification_panel"
+  top="0"
+  	height="140"
+  translate="false"
+  width="310">
+  <!-- THIS PANEL CONTROLS TOAST HEIGHT? -->
+  <panel
+    border_visible="false"
+    bevel_style="none"
+    background_visible="true"
+    bg_alpha_color="Titanium_0"
+    bg_opaque_color="Titanium_0"
+    follows="left|right|top"
+    height="100"
+    label="info_panel"
+    layout="topleft"
+    left="0"
+    name="info_panel"
+    top="0"
+    width="310">
+    <text
+      border_visible="false"
+      follows="all"
+      font="SansSerif"
+      height="85"
+      layout="topleft"
+      left="10"
+      name="text_box"
+      read_only="true"
+      text_color="NotifyTextColor"
+      text_readonly_color="NotifyTextColor"
+      top="10"
+      visible="false"
+      width="290"
+      wrap="true"/>
+    <text_editor
+      h_pad="0"
+      v_pad="0"
+      bg_readonly_color="Transparent"
+      border_visible="false"
+      embedded_items="false"
+      enabled="false"
+      follows="left|right|top|bottom"
+      font="SansSerif"
+      height="85"
+      layout="topleft"
+      left="10"
+      mouse_opaque="false"
+      name="text_editor_box"
+      read_only="true"
+      tab_stop="false"
+      text_color="NotifyTextColor"
+      text_readonly_color="NotifyTextColor"
+      top="10"
+      visible="false"
+      width="290"
+      wrap="true"
+      parse_highlights="true"
+      parse_urls="true"/>
+  </panel>
+  <panel
+    background_visible="false"
+    follows="left|right|bottom"
+    height="30"
+    width="290"
+    label="control_panel"
+    layout="topleft"
+    left="10"
+    name="control_panel"
+    top_pad="5">
+    <!--
+    Notes:
+    This panel holds buttons of notification. Change of its size can affect the layout of buttons.
+     -->
+  </panel>
+</panel>
diff --git a/indra/newview/skins/latency/xui/en/panel_notifications_channel.xml b/indra/newview/skins/latency/xui/en/panel_notifications_channel.xml
new file mode 100644
index 0000000000..c3dc588ba2
--- /dev/null
+++ b/indra/newview/skins/latency/xui/en/panel_notifications_channel.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="100"
+ layout="topleft"
+ name="notifications_panel"
+ translate="false"
+ width="100">
+    <layout_stack
+     follows="left|right|top|bottom"
+     height="78"
+     layout="topleft"
+     left="0"
+     name="stack1"
+     orientation="horizontal"
+     top="20"
+     width="100">
+      <layout_panel name="notifications_list_panel" 
+                    width="100"
+                    user_resize="true">
+        <scroll_list
+         draw_heading="true"
+         follows="left|right|top|bottom"
+         height="78"
+         layout="topleft"
+         left="0"
+         name="notifications_list"
+         sort_ascending="false"
+         sort_column="2"
+         top="0"
+         width="100">
+            <scroll_list.columns
+             label="Name"
+             name="name"
+             width="100" />
+            <scroll_list.columns
+             label="Content"
+             name="content"
+             width="150" />
+            <scroll_list.columns
+             label="Date"
+             name="date"
+             width="150" />
+        </scroll_list>
+      </layout_panel>
+      <layout_panel name="rejects_list_panel"
+                    width="100"
+                    user_resize="true">
+        <scroll_list
+         draw_heading="true"
+         follows="left|right|top|bottom"
+         height="78"
+         layout="topleft"
+         left="0"
+         name="notification_rejects_list"
+         sort_ascending="false"
+         sort_column="2"
+         top="0"
+         width="100">
+            <scroll_list.columns
+             label="Name"
+             name="name"
+             width="100" />
+            <scroll_list.columns
+             label="Content"
+             name="content"
+             width="150" />
+            <scroll_list.columns
+             label="Date"
+             name="date"
+             width="150" />
+        </scroll_list>
+      </layout_panel>
+    </layout_stack>
+    <button
+     follows="left|right|top"
+     height="20"
+     is_toggle="true"
+     layout="topleft"
+     left_delta="0"
+     name="header"
+     top_delta="-20"
+     width="100" />
+</panel>
diff --git a/indra/newview/skins/latency/xui/en/panel_notify_textbox.xml b/indra/newview/skins/latency/xui/en/panel_notify_textbox.xml
new file mode 100644
index 0000000000..414e6c343d
--- /dev/null
+++ b/indra/newview/skins/latency/xui/en/panel_notify_textbox.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+   background_visible="false"
+   bg_alpha_color="NotifyDialogBG"
+   bg_opaque_color="NotifyDialogBG"
+   height="220"
+   label="instant_message"
+   layout="topleft"
+   left="0"
+   name="panel_notify_textbox"
+   top="0"
+   width="305">
+  <string
+     name="message_max_lines_count"
+     value="30" />
+  <panel
+   bevel_style="none"
+   follows="left|right|top"
+   height="185"
+   label="info_panel"
+   layout="topleft"
+   left="0"
+   name="info_panel"
+   top="0"
+   width="305">    
+    <text_editor
+     bg_readonly_color="NotifyTextBG"
+	 border_visible="false"
+     enabled="false"
+     follows="left|right|top|bottom"
+     font="SansSerif"
+     height="110" 
+     layout="topleft"
+     left="10"
+     mouse_opaque="false"
+     name="text_editor_box"
+     read_only="true"
+     text_color="NotifyTextColor"
+     text_readonly_color="NotifyTextColor"
+     top="10"
+     value="informational text"
+     width="285"
+     wrap="true"
+     parse_highlights="true"
+     parse_urls="true"/>
+    <text_editor
+	 border_visible="true"
+     parse_urls="true"
+     enabled="true"
+     follows="all"
+     height="50"
+     layout="topleft"
+     left="10"
+     max_length="250"
+     name="message"
+     parse_highlights="true"
+     read_only="false"
+     top_pad="10"
+     type="string"
+     use_ellipses="true"
+     value="message"
+     width="285"
+     word_wrap="true">
+    </text_editor>
+  </panel>
+  <panel
+     background_visible="false"
+     follows="left|right|bottom"
+     height="25" 
+     width="290"
+     label="control_panel"
+     layout="topleft"
+     left="10"
+     name="control_panel"
+     top_pad="0">
+    <!-- 
+	 Notes:
+	 This panel holds the Ignore button and possibly other buttons of notification.
+      -->
+    <button
+     top="0"
+     follows="top|left"
+     height="20"
+     label="Submit"
+     layout="topleft"
+     name="btn_submit"
+     width="70" />
+    <button
+     follows="top|right"
+     height="20"
+     label="Ignore"
+     layout="topleft"
+     left="215"
+     name="ignore_btn"
+     top="0"
+     width="70" />
+  </panel>
+
+  <!-- <FS:Zi> Dialog Stacking browser -->
+  <button
+   layout="topleft"
+   follows="right|bottom"
+   name="DialogStackButton"
+   visibility_control="DialogStackIconVisible"
+   image_selected="Icon_DialogStack"
+   image_unselected="Icon_DialogStack"   
+   width="24"
+   height="14"
+   right="-2"
+   bottom="-2" />
+  <!-- <FS:Zi> Dialog Stacking browser -->
+</panel>

From a5787c0b96af77edc5c2b2c6c947115d9fa1781b Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sun, 2 Nov 2014 03:21:43 -0800
Subject: [PATCH 046/229] Latency: Adjust script floater layout, remvoed
 rounded lower corners and added border frame

---
 indra/newview/skins/latency/xui/en/floater_script.xml     | 4 ----
 indra/newview/skins/latency/xui/en/panel_notification.xml | 1 -
 2 files changed, 5 deletions(-)

diff --git a/indra/newview/skins/latency/xui/en/floater_script.xml b/indra/newview/skins/latency/xui/en/floater_script.xml
index d594742793..f8c148a57e 100644
--- a/indra/newview/skins/latency/xui/en/floater_script.xml
+++ b/indra/newview/skins/latency/xui/en/floater_script.xml
@@ -2,10 +2,6 @@
 <floater
 	legacy_header_height="18"
 	background_visible="true"
-	bg_opaque_image="floater_script_background"
-	bg_opaque_image_overlay="NotifyDialogBG"
-	bg_alpha_image="floater_script_background"
-	bg_alpha_image_overlay="NotifyDialogBG"
 	drop_shadow="false"
 	follows="all"
 	height="250"
diff --git a/indra/newview/skins/latency/xui/en/panel_notification.xml b/indra/newview/skins/latency/xui/en/panel_notification.xml
index b5bb4a2954..393cccfd62 100644
--- a/indra/newview/skins/latency/xui/en/panel_notification.xml
+++ b/indra/newview/skins/latency/xui/en/panel_notification.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
   background_opaque="false"
-      border_visible="true"
   background_visible="true"
   bg_alpha_color="Cerise_0"
   bg_opaque_color="Cerise_0"

From d19afac7588c6f99db6c120e625bf7dd7fe5f36d Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sun, 2 Nov 2014 03:39:47 -0800
Subject: [PATCH 047/229] Latency: Just toggle vis on lower toolbar panels
 rather than bring unfocused ones to front

---
 indra/newview/skins/latency/xui/en/panel_toolbar_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/latency/xui/en/panel_toolbar_view.xml b/indra/newview/skins/latency/xui/en/panel_toolbar_view.xml
index e124ca5b68..23a60e3d1a 100644
--- a/indra/newview/skins/latency/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/latency/xui/en/panel_toolbar_view.xml
@@ -472,7 +472,7 @@
 						 image_overlay="active_speakers.tga"
 						>
 							<button.commit_callback
-							 function="Floater.ToggleOrBringToFront"
+							 function="Floater.Toggle"
 							 parameter="fs_voice_controls"
 							/>
 						</button>
@@ -605,7 +605,7 @@
 						 image_unselected="SplitButtonRight_Off"
 						>
 							<button.commit_callback
-							 function="Floater.ToggleOrBringToFront"
+							 function="Floater.Toggle"
 							 parameter="animation_overrider"
 							/>
 						</button>
@@ -623,7 +623,7 @@
 						 image_overlay="phoenix_18"
 						>
 							<button.commit_callback
-							 function="Floater.ToggleOrBringToFront"
+							 function="Floater.Toggle"
 							 parameter="quickprefs"
 							/>
 						</button>

From f3ae6723113069909f2b7ab7cd3c38d95474e704 Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sun, 2 Nov 2014 03:42:11 -0800
Subject: [PATCH 048/229] Fix: Search resetting to homepage upon clicking the
 "Search" toolbar button when the floater its minimized (eg. after TPing via
 it)

---
 indra/newview/app_settings/commands.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 9d75719c72..3ba6d2ef7b 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -209,7 +209,7 @@
            icon="Command_Search_Icon"
            label_ref="Command_Search_Label"
            tooltip_ref="Command_Search_Tooltip"
-           execute_function="Floater.Toggle"
+           execute_function="Floater.ToggleOrBringToFront"
            execute_parameters="search"
            is_running_function="Floater.IsOpen"
            is_running_parameters="search"

From fbf0fce33ada44b0acc193ac976159873c283992 Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sun, 2 Nov 2014 04:48:57 -0800
Subject: [PATCH 049/229] Feature: Added option to log filenames of snapshots
 to local chat history Main purpose: give feedback on the quick "Snapshot to
 Disk" shortcut Secondary purpose: Add context to snapshots and chat history

---
 indra/newview/app_settings/settings.xml            | 11 +++++++++++
 indra/newview/app_settings/settings_latency.xml    | 12 +++++++++++-
 indra/newview/llviewerwindow.cpp                   | 14 ++++++++++++++
 .../default/xui/en/panel_preferences_alerts.xml    |  9 +++++++++
 indra/newview/skins/default/xui/en/strings.xml     |  1 +
 5 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 576bd7a2b4..c055fae15d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -22798,6 +22798,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>FSLogSnapshotsToLocal</key>
+    <map>
+      <key>Comment</key>
+      <string>Log filename of saved snapshots in to chat history</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
   </map>
 </llsd>
 
diff --git a/indra/newview/app_settings/settings_latency.xml b/indra/newview/app_settings/settings_latency.xml
index 67689cdc57..12ccbb46a5 100644
--- a/indra/newview/app_settings/settings_latency.xml
+++ b/indra/newview/app_settings/settings_latency.xml
@@ -723,7 +723,17 @@
 			<integer>2</integer>
 		</map>
 
-
+    <key>FSFlashOnMessage</key>
+		<map>
+		<key>Persist</key>
+			<integer>1</integer>
+		<key>Comment</key>
+			<string>Flash/Bounce the app icon when a new message is recieved and Firestorm is not in focus</string>
+		<key>Type</key>
+			<string>Boolean</string>
+		<key>Value</key>
+			<integer>1</integer>
+		</map>
 
 
 
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 18a0800887..90647e2a6f 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -47,6 +47,7 @@
 #include "llpanellogin.h"
 #include "llviewerkeyboard.h"
 #include "llviewermenu.h"
+#include "fsfloaternearbychat.h" // <FS:KC logging saved snaps filenames to chat history>
 
 #include "llviewquery.h"
 #include "llxmltree.h"
@@ -4710,6 +4711,19 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image, bool force_picke
 	while( -1 != err );  // search until the file is not found (i.e., stat() gives an error).
 
 	LL_INFOS() << "Saving snapshot to " << filepath << LL_ENDL;
+	//<FS:Kadah> Log snapshot filename to local chat history
+	FSFloaterNearbyChat* nearby_chat = FSFloaterNearbyChat::getInstance();
+	if(nearby_chat && gSavedSettings.getBOOL("FSLogSnapshotsToLocal"))
+	{
+		LLUIString notice(LLTrans::getString("SnapshotSavedToDisk"));
+		notice.setArg("[FILENAME]", filepath);
+		LLChat chat_msg(notice.getString());
+		chat_msg.mFromName = SYSTEM_FROM;
+		chat_msg.mFromID = LLUUID::null;
+		chat_msg.mSourceType = CHAT_SOURCE_SYSTEM;
+		nearby_chat->addMessage(chat_msg);
+	}
+	//</FS:Kadah>
 	return image->save(filepath);
 }
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index a2198b2e12..332b7f2921 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -297,6 +297,15 @@
      name="AutoQueryGridStatus"
      top_pad="2"
      width="160"/>
+    <check_box
+     control_name="FSLogSnapshotsToLocal"
+     height="16"
+     label="Log filename of saved snapshots in to chat history"
+     layout="topleft"
+     left="10"
+     name="FSLogSnapshotsToLocal"
+     top_pad="2"
+     width="160"/>
       
     <check_box
       control_name="FSEnableGrowl"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d3b9d47ad7..d5c0b4cd70 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -496,6 +496,7 @@ Please try logging in again in a minute.</string>
 	<string name="TeleportYourAgent">Teleport you</string>
 	<string name="ManageEstateSilently">Manage your estates silently</string>
 	<string name="ChangeYourDefaultAnimations">Change your default animations</string>
+	<string name="SnapshotSavedToDisk">'Snapshot saved: [FILENAME].</string>
 	
 	<string name="JoinAnExperience">Join an experience</string> <!-- not used -->
 	<string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string>

From db4528c8de1249d00954173861e44a481c049e36 Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sun, 2 Nov 2014 05:11:52 -0800
Subject: [PATCH 050/229] Cleaned up previous commit

---
 indra/newview/llviewerwindow.cpp               | 13 +++----------
 indra/newview/skins/default/xui/en/strings.xml |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 90647e2a6f..36ba7e5e49 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -47,7 +47,6 @@
 #include "llpanellogin.h"
 #include "llviewerkeyboard.h"
 #include "llviewermenu.h"
-#include "fsfloaternearbychat.h" // <FS:KC logging saved snaps filenames to chat history>
 
 #include "llviewquery.h"
 #include "llxmltree.h"
@@ -85,6 +84,7 @@
 #include "raytrace.h"
 
 // newview includes
+#include "fscommon.h"
 #include "llagent.h"
 #include "llbox.h"
 #include "llchicletbar.h"
@@ -4712,16 +4712,9 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image, bool force_picke
 
 	LL_INFOS() << "Saving snapshot to " << filepath << LL_ENDL;
 	//<FS:Kadah> Log snapshot filename to local chat history
-	FSFloaterNearbyChat* nearby_chat = FSFloaterNearbyChat::getInstance();
-	if(nearby_chat && gSavedSettings.getBOOL("FSLogSnapshotsToLocal"))
+	if (gSavedSettings.getBOOL("FSLogSnapshotsToLocal"))
 	{
-		LLUIString notice(LLTrans::getString("SnapshotSavedToDisk"));
-		notice.setArg("[FILENAME]", filepath);
-		LLChat chat_msg(notice.getString());
-		chat_msg.mFromName = SYSTEM_FROM;
-		chat_msg.mFromID = LLUUID::null;
-		chat_msg.mSourceType = CHAT_SOURCE_SYSTEM;
-		nearby_chat->addMessage(chat_msg);
+		reportToNearbyChat(LLTrans::getString("SnapshotSavedToDisk") + filepath);
 	}
 	//</FS:Kadah>
 	return image->save(filepath);
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d5c0b4cd70..f053315822 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -496,7 +496,7 @@ Please try logging in again in a minute.</string>
 	<string name="TeleportYourAgent">Teleport you</string>
 	<string name="ManageEstateSilently">Manage your estates silently</string>
 	<string name="ChangeYourDefaultAnimations">Change your default animations</string>
-	<string name="SnapshotSavedToDisk">'Snapshot saved: [FILENAME].</string>
+	<string name="SnapshotSavedToDisk">Snapshot saved: </string>
 	
 	<string name="JoinAnExperience">Join an experience</string> <!-- not used -->
 	<string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string>

From 3eb1e34bb847b44e8a1cc74e68fc68864ae12798 Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sun, 2 Nov 2014 05:18:20 -0800
Subject: [PATCH 051/229] Fix to previous commit due to string.xml leading and
 trailing trims

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

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 36ba7e5e49..ff41f176cf 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4714,7 +4714,7 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image, bool force_picke
 	//<FS:Kadah> Log snapshot filename to local chat history
 	if (gSavedSettings.getBOOL("FSLogSnapshotsToLocal"))
 	{
-		reportToNearbyChat(LLTrans::getString("SnapshotSavedToDisk") + filepath);
+		reportToNearbyChat(LLTrans::getString("SnapshotSavedToDisk") + " " + filepath);
 	}
 	//</FS:Kadah>
 	return image->save(filepath);

From 470e6a7e5ec568d916766fdeb8104803ffa42b37 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sun, 2 Nov 2014 14:43:34 +0100
Subject: [PATCH 052/229] Updated Polish translation (ed125023f2af,
 c0b91b6e0616 and 3e6e9da91a50)

---
 .../newview/skins/default/xui/pl/panel_preferences_alerts.xml  | 1 +
 indra/newview/skins/default/xui/pl/strings.xml                 | 3 +++
 indra/newview/skins/starlight/xui/pl/panel_status_bar.xml      | 3 +++
 indra/newview/skins/starlightcui/xui/pl/panel_status_bar.xml   | 3 +++
 4 files changed, 10 insertions(+)

diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
index 631e87b51e..a9de785393 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
@@ -35,6 +35,7 @@
 		<check_box label="Mrugaj ikoną aplikacji, gdy otwiera się okno dialogowe skryptu, a [APP_NAME] jest w tle" name="FSFlashOnScriptDialog"/>
 		<check_box label="Wyłącz powiadomienia mówiące o zwróceniu przedmiotów do szafy" name="FSDisableReturnObjectNotification"/>
 		<check_box label="Pobieraj najnowszego newsa z status.secondlifegrid.net przy logowaniu" name="AutoQueryGridStatus"/>
+		<check_box label="Pokazuj nazwy zapisanych zdjęć w historii czatu" name="FSLogSnapshotsToLocal"/>
 		<check_box label="Włącz powiadomienia Growl" name="notify_growl_checkbox"/>
 		<check_box label="Włącz Growl nawet gdy Firestorm jest aktywny" name="notify_growl_always_checkbox"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 8c1233d393..7c48bccc0d 100755
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -1041,6 +1041,9 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="ChangeYourDefaultAnimations">
 		Zmieniać Twoje domyślne animacje
 	</string>
+	<string name="SnapshotSavedToDisk">
+		Zdjęcie zapisane:
+	</string>
 	<string name="JoinAnExperience">
 		Rozpocznij przygodę
 	</string>
diff --git a/indra/newview/skins/starlight/xui/pl/panel_status_bar.xml b/indra/newview/skins/starlight/xui/pl/panel_status_bar.xml
index d80f8f24fa..8e5d4b0fb2 100644
--- a/indra/newview/skins/starlight/xui/pl/panel_status_bar.xml
+++ b/indra/newview/skins/starlight/xui/pl/panel_status_bar.xml
@@ -17,6 +17,9 @@
 	<panel.string name="buycurrencylabel">
 		[AMT] L$
 	</panel.string>
+	<panel name="menu_search_panel">
+		<search_editor label="Szukaj w menu" name="search_menu_edit" tool_tip="Wprowadź w tym miejscu interesującą Cię frazę. Wyniki będą wyświetlane dla pasujących fragmentów nazw przypisanych do opcji menu." />
+	</panel>
 	<panel name="balance_bg">
 		<text name="balance" tool_tip="Kliknij aby odświeżyć saldo L$"/>
 		<button label="KUP L$" name="buyL" tool_tip="Kliknij aby kupić więcej L$"/>
diff --git a/indra/newview/skins/starlightcui/xui/pl/panel_status_bar.xml b/indra/newview/skins/starlightcui/xui/pl/panel_status_bar.xml
index d80f8f24fa..8e5d4b0fb2 100644
--- a/indra/newview/skins/starlightcui/xui/pl/panel_status_bar.xml
+++ b/indra/newview/skins/starlightcui/xui/pl/panel_status_bar.xml
@@ -17,6 +17,9 @@
 	<panel.string name="buycurrencylabel">
 		[AMT] L$
 	</panel.string>
+	<panel name="menu_search_panel">
+		<search_editor label="Szukaj w menu" name="search_menu_edit" tool_tip="Wprowadź w tym miejscu interesującą Cię frazę. Wyniki będą wyświetlane dla pasujących fragmentów nazw przypisanych do opcji menu." />
+	</panel>
 	<panel name="balance_bg">
 		<text name="balance" tool_tip="Kliknij aby odświeżyć saldo L$"/>
 		<button label="KUP L$" name="buyL" tool_tip="Kliknij aby kupić więcej L$"/>

From 29911b79288bf25afcbf95c37e45e924fb59a3d1 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 2 Nov 2014 16:03:32 +0100
Subject: [PATCH 053/229] Nicer string formatting

---
 indra/newview/llviewerwindow.cpp               | 4 +++-
 indra/newview/skins/default/xui/en/strings.xml | 2 +-
 indra/newview/skins/default/xui/pl/strings.xml | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index ff41f176cf..5232e8b319 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4714,7 +4714,9 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image, bool force_picke
 	//<FS:Kadah> Log snapshot filename to local chat history
 	if (gSavedSettings.getBOOL("FSLogSnapshotsToLocal"))
 	{
-		reportToNearbyChat(LLTrans::getString("SnapshotSavedToDisk") + " " + filepath);
+		LLStringUtil::format_map_t args;
+		args["FILENAME"] = filepath;
+		reportToNearbyChat(LLTrans::getString("SnapshotSavedToDisk", args));
 	}
 	//</FS:Kadah>
 	return image->save(filepath);
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f053315822..be20a7f332 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -496,7 +496,7 @@ Please try logging in again in a minute.</string>
 	<string name="TeleportYourAgent">Teleport you</string>
 	<string name="ManageEstateSilently">Manage your estates silently</string>
 	<string name="ChangeYourDefaultAnimations">Change your default animations</string>
-	<string name="SnapshotSavedToDisk">Snapshot saved: </string>
+	<string name="SnapshotSavedToDisk">Snapshot saved: [FILENAME]</string>
 	
 	<string name="JoinAnExperience">Join an experience</string> <!-- not used -->
 	<string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 7c48bccc0d..c60bb543c0 100755
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -1042,7 +1042,7 @@ Spróbuj zalogować się ponownie za minutę.
 		Zmieniać Twoje domyślne animacje
 	</string>
 	<string name="SnapshotSavedToDisk">
-		Zdjęcie zapisane:
+		Zdjęcie zapisane: [FILENAME]
 	</string>
 	<string name="JoinAnExperience">
 		Rozpocznij przygodę

From b9316675921f012a81ffa8ef49dcaf4b72db694d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 2 Nov 2014 16:13:22 +0100
Subject: [PATCH 054/229] Updated German translation

---
 .../skins/default/xui/de/panel_preferences_alerts.xml    | 1 +
 indra/newview/skins/default/xui/de/strings.xml           | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
index 551ed08d05..80868cea55 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
@@ -37,6 +37,7 @@
 	<check_box label="Anwendungsicon blinkt bei neuen Skriptdialogen, wenn [APP_NAME] keinen Fokus besitzt" name="FSFlashOnScriptDialog"/>
 	<check_box label="Objekt-Rückgabe-Benachrichtung deaktivieren" name="FSDisableReturnObjectNotification"/>
 	<check_box label="Aktuelle Neuigkeiten von status.secondlifegrid.net beim Login abrufen" name="AutoQueryGridStatus"/>
+	<check_box label="Dateinamen von gespeicherten Schnappschüssen im Chat in der Nähe protokollieren" name="FSLogSnapshotsToLocal"/>
 	<check_box label="Growl-Benachrichtigungen aktivieren" name="notify_growl_checkbox"/>
 	<check_box label="Growl nutzen auch wenn Firestorm aktiv ist" name="notify_growl_always_checkbox"/>
     </panel>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index c5b51765e8..f26ff82582 100755
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1067,6 +1067,15 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="TeleportYourAgent">
 		Sie teleportieren
 	</string>
+	<string name="ManageEstateSilently">
+		Grundbesitz leise verwalten
+	</string>
+	<string name="ChangeYourDefaultAnimations">
+		Ihre Standardanimationen ändern
+	</string>
+	<string name="SnapshotSavedToDisk">
+		Schnappschuss gespeichert: [FILENAME]
+	</string>
 	<string name="JoinAnExperience">
 		Bei einem Erlebnis mitmachen
 	</string>

From 217f337a866e1353ce4a78191f13071395117a4d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 2 Nov 2014 20:17:26 +0100
Subject: [PATCH 055/229] FIRE-14864: Shot in the blue fix for APR mess with
 paths containing spaces and trailing directory delimiters

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

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 4a0d958849..3aa68019af 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -486,7 +486,7 @@ void LLVivoxVoiceClient::connectorCreate()
 	{
 		logpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
 	}
-	else if (LLStringUtil::endsWith(logpath, gDirUtilp->getDirDelimiter()))
+	if (LLStringUtil::endsWith(logpath, gDirUtilp->getDirDelimiter()))
 	{
 		logpath = logpath.substr(0, logpath.size() - gDirUtilp->getDirDelimiter().size());
 	}
@@ -834,13 +834,13 @@ void LLVivoxVoiceClient::stateMachine()
                         {
                             log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
                         }
+                        
 						// <FS:Ansariel> Strip trailing directory delimiter
-						else if (LLStringUtil::endsWith(log_folder, gDirUtilp->getDirDelimiter()))
+						if (LLStringUtil::endsWith(log_folder, gDirUtilp->getDirDelimiter()))
 						{
 							log_folder = log_folder.substr(0, log_folder.size() - gDirUtilp->getDirDelimiter().size());
 						}
 						// </FS:Ansariel>
-                        
 						params.args.add("-lf");
 						params.args.add(log_folder);
 

From 4a3494552c4181a7dcad3f8fb81949f7c0975c74 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sun, 2 Nov 2014 23:58:18 +0100
Subject: [PATCH 056/229] FIRE-14896; Don't crash if FS AO folder contains
 another folder with an empty name.

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

diff --git a/indra/newview/aoengine.cpp b/indra/newview/aoengine.cpp
index 032916c6ca..c5262d53ea 100644
--- a/indra/newview/aoengine.cpp
+++ b/indra/newview/aoengine.cpp
@@ -1039,6 +1039,13 @@ void AOEngine::update()
 	{
 		LLViewerInventoryCategory* currentCategory=categories->at(index);
 		const std::string& setFolderName=currentCategory->getName();
+
+		if( setFolderName.empty())
+		{
+			LL_WARNS("AOEngine") << "Folder with emtpy name in AO folder" << LL_ENDL;
+			continue;
+		}
+
 		std::vector<std::string> params;
 		LLStringUtil::getTokens(setFolderName,params,":");
 

From 978fd56801c9b8facd4822a1ef1ab4201b2380ee Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Mon, 3 Nov 2014 00:20:14 +0100
Subject: [PATCH 057/229] Remove popup for Vintage skin on clean install.

---
 indra/newview/app_settings/settings.xml              | 11 -----------
 indra/newview/llstartup.cpp                          |  8 --------
 indra/newview/skins/default/xui/de/notifications.xml |  5 -----
 indra/newview/skins/default/xui/en/notifications.xml |  9 ---------
 4 files changed, 33 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c055fae15d..5dd02d8340 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -20817,17 +20817,6 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>FSVintageLoginInfo</key>
-    <map>
-      <key>Comment</key>
-      <string>Shows the "did you know about Phoenix mode?" message at login screen, once per installation. TRUE means, that notification won't be displayed.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>FSShowMutedChatHistory</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 693ae45036..db3a7fe62b 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2807,14 +2807,6 @@ void login_show()
 	}
 	
 	LLPanelLogin::show(	gViewerWindow->getWindowRectScaled(), login_callback, NULL );
-
-	// <FS:PP> "Did you know about Phoenix mode?" notification, showed once per installation
-	if (!gSavedSettings.getBOOL("FSVintageLoginInfo"))
-	{
-		gSavedSettings.setBOOL("FSVintageLoginInfo", TRUE);
-		LLNotificationsUtil::add("VintageLoginInfo");
-	}
-
 }
 
 // Callback for when login screen is closed.  Option 0 = connect, option 1 = quit.
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 5480ade1db..30bc30ffc1 100755
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -4632,11 +4632,6 @@ Aktueller Simulator: [NEWVERSION]
 Vorheriger Simulator: [OLDVERSION]
 	</notification>
 
-	<notification name="VintageLoginInfo">
-Wussten Sie schon, dass Sie die klassische Benutzeroberläche im Stil des Phoenix Viewers verwenden können? Wählen Sie den Phoenix-Modus in der „Modus“-Auswahlbox auf der rechten Seite aus.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-
 	<notification name="CannotSaveSnapshot">
 Foto konnte nicht gespeichert werden.
 	</notification>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2cf94bd1e8..e547c0afda 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11469,15 +11469,6 @@ Current simulator: [NEWVERSION]
 Previous simulator: [OLDVERSION]
   </notification>
   
-  <notification
-   name="VintageLoginInfo"
-   type="alertmodal">
-Did you know you can get the classic Phoenix Viewer look with Firestorm? Go to the "select mode" menu on the right and select "Phoenix".
-    <usetemplate
-      name="okbutton"
-      yestext="OK"/>
-  </notification>
-  
   <notification
    icon="alertmodal.tga"
    name="CannotSaveSnapshot"

From 1ac25e14ee7d7c2e2abf4ae39453acb1c7b17a42 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Mon, 3 Nov 2014 00:48:00 +0100
Subject: [PATCH 058/229] Removed remaining translations for the popup as well

---
 indra/newview/skins/default/xui/es/notifications.xml | 4 ----
 indra/newview/skins/default/xui/pl/notifications.xml | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 170982b2c8..9c9a4f3228 100755
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -5278,10 +5278,6 @@ Intento cancelado.
 Simulador actual:   [NEWVERSION]
 Simulador anterior: [OLDVERSION]
 	</notification>
-	<notification name="VintageLoginInfo">
-		¿Sabías que puedes obtener la clásica apariencia de Phoenix en Firestorm? Ve al menú "Modo", a la derecha, y selecciona "Phoenix".
-		<usetemplate name="okbutton" yestext="Aceptar"/>
-	</notification>
 	<notification name="CannotSaveSnapshot">
 		No se ha podido guardar la fotografía.
 	</notification>
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index e30e8350ef..0a6f958fe2 100755
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -4477,10 +4477,6 @@ Czy chcesz autoryzować [APP_NAME] do ładowania zdjęć na Flickr?
 Obecny symulator: [NEWVERSION]
 Poprzedni symulator: [OLDVERSION]
 	</notification>
-	<notification name="VintageLoginInfo">
-		Czy wiesz, że możesz sprawić, aby Firestorm wyglądał jak klasyczny Phoenix Viewer? Wybierz w tym celu pozycję "Phoenix" z listy "wybierz tryb" po prawej.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
 	<notification name="CannotSaveSnapshot">
 		Zapis zdjęcia zakończony niepowodzeniem.
 	</notification>

From e4d3ee6ae78ce4acc40d1fc93b30e4ea1a85ca67 Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sun, 2 Nov 2014 21:15:19 -0800
Subject: [PATCH 059/229] Fix: Added back support for recolorable script
 dialogs Now with 21% more less brokage

---
 indra/newview/app_settings/settings.xml       |  13 ++
 indra/newview/llappviewer.cpp                 |  11 ++
 indra/newview/lltoastnotifypanel.cpp          |   2 +-
 .../skins/default/xui/en/floater_script.xml   |  36 +++---
 indra/newview/skins/latency/colors.xml        |  12 +-
 .../windows/floater_script_background.tga     | Bin 968 -> 386 bytes
 .../skins/latency/xui/en/floater_script.xml   |  13 +-
 .../latency/xui/en/panel_group_notify.xml     |  12 +-
 .../latency/xui/en/panel_notification.xml     | 113 ------------------
 .../xui/en/panel_notification_script.xml      |  87 --------------
 .../xui/en/panel_notifications_channel.xml    |  83 -------------
 .../latency/xui/en/panel_notify_textbox.xml   | 112 -----------------
 12 files changed, 67 insertions(+), 427 deletions(-)
 delete mode 100644 indra/newview/skins/latency/xui/en/panel_notification.xml
 delete mode 100644 indra/newview/skins/latency/xui/en/panel_notification_script.xml
 delete mode 100644 indra/newview/skins/latency/xui/en/panel_notifications_channel.xml
 delete mode 100644 indra/newview/skins/latency/xui/en/panel_notify_textbox.xml

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 5dd02d8340..e0f052e60d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -22798,6 +22798,19 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FSLatencyOneTimeFixRun</key>
+    <map>
+        <key>Comment</key>
+        <string>One time fix has run for this install for script dialog colors on Latency</string>
+        <key>Persist</key>
+        <integer>0</integer>
+        <key>HideFromEditor</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>Boolean</string>
+        <key>Value</key>
+        <integer>0</integer>
+    </map>
   </map>
 </llsd>
 
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 0ee34a5975..36dccfedcf 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3379,6 +3379,17 @@ bool LLAppViewer::initConfiguration()
 	gLastRunVersion = gSavedSettings.getString("LastRunVersion");
 
 	loadColorSettings();
+    
+    //<FS:KC> One time fix for Latency
+    if ((gLastRunVersion != LLVersionInfo::getChannelAndVersion()) && (gSavedSettings.getString("SkinCurrent") == "latency") && !gSavedSettings.getBOOL("FSLatencyOneTimeFixRun"))
+    {
+        LL_INFOS() << "FSLatencyOneTimeFix: Fixing script dialog colors." << LL_ENDL;
+        // Replace previously saved script dialog colors with new defaults, which happen to be the same as the group notice colors
+        LLUIColorTable::instance().setColor("ScriptDialog", LLUIColorTable::instance().getColor("GroupNotifyDialogBG", LLColor4::grey4));
+        LLUIColorTable::instance().setColor("ScriptDialogFg", LLUIColorTable::instance().getColor("GroupNotifyTextColor", LLColor4::white));
+        gSavedSettings.setBOOL("FSLatencyOneTimeFixRun", TRUE);
+    }
+    //</FS:KC>
 
 	// Let anyone else who cares know that we've populated our settings
 	// variables.
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index 6204cd1b1c..c7183a715c 100755
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -323,7 +323,7 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
 	mTextBox->setIsFriendCallback(LLAvatarActions::isFriend);
 
 	// <FS:Ansariel> Script dialog colors
-	if (mIsScriptDialog && (gSavedSettings.getString("SkinCurrent") != "latency")) //<FS:Kadah> HAX: don't override skin's text color
+	if (mIsScriptDialog)
 	{
 		LLColor4 script_dialog_fg_color = LLUIColorTable::instance().getColor("ScriptDialogFg", LLColor4::white).get();
 		mTextBox->setColor(script_dialog_fg_color);
diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml
index 8384f94280..52d6010882 100755
--- a/indra/newview/skins/default/xui/en/floater_script.xml
+++ b/indra/newview/skins/default/xui/en/floater_script.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
- background_visible="true"
- background_opaque="true"
- border_visible="false"
- bg_opaque_image="none"
- bg_alpha_image="none"
- bg_alpha_color="ScriptDialog"
- bg_opaque_color="ScriptDialog"
- height="250"
- layout="topleft"
- name="script_floater"
- can_dock="true"
- can_minimize="true"
- visible="false"
- width="350"
- can_resize="false"
- min_width="350"
- min_height="200">
+	legacy_header_height="18"
+	background_visible="true"
+	background_opaque="true"
+	border_visible="false"
+	bg_opaque_image="none"
+	bg_alpha_image="none"
+	bg_alpha_color="ScriptDialog"
+	bg_opaque_color="ScriptDialog"
+	height="250"
+	layout="topleft"
+	name="script_floater"
+	can_dock="true"
+	can_minimize="true"
+	visible="false"
+	width="350"
+	can_resize="false"
+	min_width="350"
+	min_height="200">
 </floater>
diff --git a/indra/newview/skins/latency/colors.xml b/indra/newview/skins/latency/colors.xml
index bf83874dc3..f5aedbea66 100644
--- a/indra/newview/skins/latency/colors.xml
+++ b/indra/newview/skins/latency/colors.xml
@@ -83,13 +83,19 @@
 		name="ChatHistoryBgColor"
 		reference="drkgrey123" />
 	<color
-		name="NotifyDialogBG"
+		name="GroupNotifyDialogBG"
 		reference="drkgrey123" />
 	<color
-		name="NotifyTextBG"
+		name="GroupNotifyTextBG"
 		reference="drkgrey123" />
 	<color
-		name="NotifyTextColor"
+		name="GroupNotifyTextColor"
+		reference="White" />
+	<color
+		name="ScriptDialog"
+		reference="drkgrey123" />
+	<color
+		name="ScriptDialogFg"
 		reference="White" />
 	<color
 		name="HighlightChildColor"
diff --git a/indra/newview/skins/latency/textures/windows/floater_script_background.tga b/indra/newview/skins/latency/textures/windows/floater_script_background.tga
index 8a872cab0bfa5b65f06c265555e990507d4845b9..9b62fdf9e2f32e64e2a50f84b456d97dda15fcfe 100644
GIT binary patch
literal 386
lcmZQz;9`IQ1qKBM35NMl?%e<X|HEWP*^rQ+b~u2-8URU)ZLI(R

literal 968
zcmc(e%}T>i5QVRQAZ~5;T{eQgLBvgkfGGHftE_wpiyO6Fh_B!ahzrR=L?o+rk%jNl
z?n`n#-=w+42M`12bY{-n$(bZ|Zp*dTf$O^N=E!^R)<u!f5n^FS=)H&%l-{C(LPun0
zhKigMZQqGv8WSNC&~u?c8PhYN)I|3oTB=WNtzc@?XDU+*foY6jdSdspJDZ0G)!c@N
z4e+=x+z8)7^(ykHl|TiB4mu+{izBxtVmVg77D{gEsg?p2l#cacARJ)MtuRCKt3pkn
ztA2zrT0ay0(yW{DGlBEW>DXkJ=2ZJOQ0MO=k1`iRzhX1eu8z;?hsc~y^-IN8<?aOR
zUVe(q56jupSW$pH7>XLxZy~Z89RndIuqj_Okl7T1OsGPcN1n0Ch<9j1N2Ga3bJ8ND
v1?eQD6Vh==?YsD|bm`e_EIl`0>))7M{8i6SFZ!41S$cB3dv%x|_4nKlFv0HO

diff --git a/indra/newview/skins/latency/xui/en/floater_script.xml b/indra/newview/skins/latency/xui/en/floater_script.xml
index f8c148a57e..2ca75158d6 100644
--- a/indra/newview/skins/latency/xui/en/floater_script.xml
+++ b/indra/newview/skins/latency/xui/en/floater_script.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-	legacy_header_height="18"
+	bg_opaque_image="floater_script_background"
+	bg_opaque_image_overlay="ScriptDialog"
+	bg_alpha_image="floater_script_background"
+	bg_alpha_image_overlay="ScriptDialog"
+	can_close="true"
+	sound_flags="0"
 	background_visible="true"
-	drop_shadow="false"
-	follows="all"
+	legacy_header_height="18"
+	border_visible="true"
 	height="250"
 	layout="topleft"
 	name="script_floater"
-	can_dock="true"
+	can_dock="false"
 	can_minimize="false"
 	visible="false"
 	width="350"
diff --git a/indra/newview/skins/latency/xui/en/panel_group_notify.xml b/indra/newview/skins/latency/xui/en/panel_group_notify.xml
index 3fccdf98e9..03aace7b9e 100644
--- a/indra/newview/skins/latency/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/latency/xui/en/panel_group_notify.xml
@@ -4,7 +4,7 @@
 	border_thickness="1"
 	background_visible="true"
 	background_opaque="true"
-	bg_opaque_color="NotifyDialogBG"
+	bg_opaque_color="GroupNotifyDialogBG"
 	height="260"
 	label="instant_message"
 	layout="topleft"
@@ -28,7 +28,7 @@
 		layout="topleft"
 		left="10"
 		name="group_notice"
-		text_color="NotifyTextColor"
+		text_color="GroupNotifyTextColor"
 		top_pad="5"
 		use_ellipses="true"
 		value="Group Notice"
@@ -41,7 +41,7 @@
 		layout="topleft"
 		left="10"
 		name="title"
-		text_color="NotifyTextColor"
+		text_color="GroupNotifyTextColor"
 		top_pad="4"
 		use_ellipses="true"
 		value="Sent by Sender Name, Group Name" 
@@ -71,7 +71,7 @@
 		parse_highlights="true"
 		read_only="true"
 		right="-8"
-		text_readonly_color="NotifyTextColor"
+		text_readonly_color="GroupNotifyTextColor"
 		type="string"
 		use_ellipses="true"
 		value="message"
@@ -85,7 +85,7 @@
 		name="attachment_label"
 		parse_urls="false"
 		width="60"
-		text_color="NotifyTextColor"
+		text_color="GroupNotifyTextColor"
 		value="Attached:" />
 	<panel
 		name="attachment_container"
@@ -114,7 +114,7 @@
 			name="attachment"
 			parse_urls="false"
 			right="-1"
-			text_color="NotifyTextColor"
+			text_color="GroupNotifyTextColor"
 			value="Attachment"
 			use_ellipses="true" />
 	</panel>
diff --git a/indra/newview/skins/latency/xui/en/panel_notification.xml b/indra/newview/skins/latency/xui/en/panel_notification.xml
deleted file mode 100644
index 393cccfd62..0000000000
--- a/indra/newview/skins/latency/xui/en/panel_notification.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-  background_opaque="false"
-  background_visible="true"
-  bg_alpha_color="Cerise_0"
-  bg_opaque_color="Cerise_0"
-  label="notification_panel"
-  layout="topleft"
-  left="0"
-  name="notification_panel"
-  chrome="true"
-  top="0"
-  	height="140"
-  translate="false"
-  width="305">
-  <!-- THIS PANEL CONTROLS TOAST HEIGHT? -->
-  <panel
-      border_visible="false"
- bevel_style="none"
-    background_visible="true"
-  bg_alpha_color="Titanium_0"
-  bg_opaque_color="Titanium_0"
-    follows="left|right|top"
-    height="100"
-    label="info_panel"
-    layout="topleft"
-    left="0"
-    name="info_panel"
-    top="0"
-    width="305">
-    <text
-      border_visible="false"
-      follows="left|right|top|bottom"
-      font="SansSerif"
-      height="85"
-      layout="topleft"
-      left="10"
-      name="text_box"
-      read_only="true"
-      text_color="NotifyTextColor"
-      top="10"
-      visible="false" 
-      width="285"
-      wrap="true"/>
-    <text
-      border_visible="false"
-      follows="left|right|top|bottom"
-      font="SansSerifBold"
-      height="85"
-      layout="topleft"
-      left="10"
-      name="caution_text_box"
-      text_color="NotifyCautionBoxColor"
-      top="10"
-      visible="false"
-      width="285"
-      wrap="true"/>
-    <text_editor
-    	h_pad="0"
-		v_pad="0"
-      bg_readonly_color="Transparent"
-      border_visible="false"
-      embedded_items="false"
-      enabled="false"
-      follows="left|right|top|bottom"
-      font="SansSerif"
-      height="85" 
-      layout="topleft"
-      left="10"
-      mouse_opaque="false"
-      name="text_editor_box"
-      read_only="true"
-      tab_stop="false"
-      text_color="NotifyTextColor"
-      text_readonly_color="NotifyTextColor"
-      top="10"
-      visible="true"
-	  value="Test."
-      width="285"
-      wrap="true"
-      parse_highlights="true"
-      parse_urls="true"/>
-  </panel>
-  <panel
-    background_visible="false"
-    follows="left|right|bottom"
-    height="30" 
-    width="290"
-    label="control_panel"
-    layout="topleft"
-    left="10"
-    name="control_panel"
-    top_pad="5">
-    <!-- 
-    Notes:
-    This panel holds buttons of notification. Change of its size can affect the layout of buttons. 
-     -->
-  </panel>
-
-  <!-- <FS:Zi> Dialog Stacking browser -->
-  <button
-    layout="topleft"
-    follows="right|bottom"
-    name="DialogStackButton"
-    visibility_control="DialogStackIconVisible"
-    image_selected="Icon_DialogStack"
-    image_unselected="Icon_DialogStack"   
-    width="24"
-    height="14"
-    right="-2"
-    bottom="-2" />
-  <!-- <FS:Zi> Dialog Stacking browser -->
-</panel>
diff --git a/indra/newview/skins/latency/xui/en/panel_notification_script.xml b/indra/newview/skins/latency/xui/en/panel_notification_script.xml
deleted file mode 100644
index b4fa1db9e9..0000000000
--- a/indra/newview/skins/latency/xui/en/panel_notification_script.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- lots of colors changed in this file -->
-<panel
-  background_opaque="false"
-  border_visible="false"
-  background_visible="false"
-  bg_alpha_color="NotifyDialogBG"
-  bg_opaque_color="NotifyDialogBG"
-  label="notification_panel"
-  layout="topleft"
-  left="0"
-  name="notification_panel"
-  top="0"
-  	height="140"
-  translate="false"
-  width="310">
-  <!-- THIS PANEL CONTROLS TOAST HEIGHT? -->
-  <panel
-    border_visible="false"
-    bevel_style="none"
-    background_visible="true"
-    bg_alpha_color="Titanium_0"
-    bg_opaque_color="Titanium_0"
-    follows="left|right|top"
-    height="100"
-    label="info_panel"
-    layout="topleft"
-    left="0"
-    name="info_panel"
-    top="0"
-    width="310">
-    <text
-      border_visible="false"
-      follows="all"
-      font="SansSerif"
-      height="85"
-      layout="topleft"
-      left="10"
-      name="text_box"
-      read_only="true"
-      text_color="NotifyTextColor"
-      text_readonly_color="NotifyTextColor"
-      top="10"
-      visible="false"
-      width="290"
-      wrap="true"/>
-    <text_editor
-      h_pad="0"
-      v_pad="0"
-      bg_readonly_color="Transparent"
-      border_visible="false"
-      embedded_items="false"
-      enabled="false"
-      follows="left|right|top|bottom"
-      font="SansSerif"
-      height="85"
-      layout="topleft"
-      left="10"
-      mouse_opaque="false"
-      name="text_editor_box"
-      read_only="true"
-      tab_stop="false"
-      text_color="NotifyTextColor"
-      text_readonly_color="NotifyTextColor"
-      top="10"
-      visible="false"
-      width="290"
-      wrap="true"
-      parse_highlights="true"
-      parse_urls="true"/>
-  </panel>
-  <panel
-    background_visible="false"
-    follows="left|right|bottom"
-    height="30"
-    width="290"
-    label="control_panel"
-    layout="topleft"
-    left="10"
-    name="control_panel"
-    top_pad="5">
-    <!--
-    Notes:
-    This panel holds buttons of notification. Change of its size can affect the layout of buttons.
-     -->
-  </panel>
-</panel>
diff --git a/indra/newview/skins/latency/xui/en/panel_notifications_channel.xml b/indra/newview/skins/latency/xui/en/panel_notifications_channel.xml
deleted file mode 100644
index c3dc588ba2..0000000000
--- a/indra/newview/skins/latency/xui/en/panel_notifications_channel.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- height="100"
- layout="topleft"
- name="notifications_panel"
- translate="false"
- width="100">
-    <layout_stack
-     follows="left|right|top|bottom"
-     height="78"
-     layout="topleft"
-     left="0"
-     name="stack1"
-     orientation="horizontal"
-     top="20"
-     width="100">
-      <layout_panel name="notifications_list_panel" 
-                    width="100"
-                    user_resize="true">
-        <scroll_list
-         draw_heading="true"
-         follows="left|right|top|bottom"
-         height="78"
-         layout="topleft"
-         left="0"
-         name="notifications_list"
-         sort_ascending="false"
-         sort_column="2"
-         top="0"
-         width="100">
-            <scroll_list.columns
-             label="Name"
-             name="name"
-             width="100" />
-            <scroll_list.columns
-             label="Content"
-             name="content"
-             width="150" />
-            <scroll_list.columns
-             label="Date"
-             name="date"
-             width="150" />
-        </scroll_list>
-      </layout_panel>
-      <layout_panel name="rejects_list_panel"
-                    width="100"
-                    user_resize="true">
-        <scroll_list
-         draw_heading="true"
-         follows="left|right|top|bottom"
-         height="78"
-         layout="topleft"
-         left="0"
-         name="notification_rejects_list"
-         sort_ascending="false"
-         sort_column="2"
-         top="0"
-         width="100">
-            <scroll_list.columns
-             label="Name"
-             name="name"
-             width="100" />
-            <scroll_list.columns
-             label="Content"
-             name="content"
-             width="150" />
-            <scroll_list.columns
-             label="Date"
-             name="date"
-             width="150" />
-        </scroll_list>
-      </layout_panel>
-    </layout_stack>
-    <button
-     follows="left|right|top"
-     height="20"
-     is_toggle="true"
-     layout="topleft"
-     left_delta="0"
-     name="header"
-     top_delta="-20"
-     width="100" />
-</panel>
diff --git a/indra/newview/skins/latency/xui/en/panel_notify_textbox.xml b/indra/newview/skins/latency/xui/en/panel_notify_textbox.xml
deleted file mode 100644
index 414e6c343d..0000000000
--- a/indra/newview/skins/latency/xui/en/panel_notify_textbox.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-   background_visible="false"
-   bg_alpha_color="NotifyDialogBG"
-   bg_opaque_color="NotifyDialogBG"
-   height="220"
-   label="instant_message"
-   layout="topleft"
-   left="0"
-   name="panel_notify_textbox"
-   top="0"
-   width="305">
-  <string
-     name="message_max_lines_count"
-     value="30" />
-  <panel
-   bevel_style="none"
-   follows="left|right|top"
-   height="185"
-   label="info_panel"
-   layout="topleft"
-   left="0"
-   name="info_panel"
-   top="0"
-   width="305">    
-    <text_editor
-     bg_readonly_color="NotifyTextBG"
-	 border_visible="false"
-     enabled="false"
-     follows="left|right|top|bottom"
-     font="SansSerif"
-     height="110" 
-     layout="topleft"
-     left="10"
-     mouse_opaque="false"
-     name="text_editor_box"
-     read_only="true"
-     text_color="NotifyTextColor"
-     text_readonly_color="NotifyTextColor"
-     top="10"
-     value="informational text"
-     width="285"
-     wrap="true"
-     parse_highlights="true"
-     parse_urls="true"/>
-    <text_editor
-	 border_visible="true"
-     parse_urls="true"
-     enabled="true"
-     follows="all"
-     height="50"
-     layout="topleft"
-     left="10"
-     max_length="250"
-     name="message"
-     parse_highlights="true"
-     read_only="false"
-     top_pad="10"
-     type="string"
-     use_ellipses="true"
-     value="message"
-     width="285"
-     word_wrap="true">
-    </text_editor>
-  </panel>
-  <panel
-     background_visible="false"
-     follows="left|right|bottom"
-     height="25" 
-     width="290"
-     label="control_panel"
-     layout="topleft"
-     left="10"
-     name="control_panel"
-     top_pad="0">
-    <!-- 
-	 Notes:
-	 This panel holds the Ignore button and possibly other buttons of notification.
-      -->
-    <button
-     top="0"
-     follows="top|left"
-     height="20"
-     label="Submit"
-     layout="topleft"
-     name="btn_submit"
-     width="70" />
-    <button
-     follows="top|right"
-     height="20"
-     label="Ignore"
-     layout="topleft"
-     left="215"
-     name="ignore_btn"
-     top="0"
-     width="70" />
-  </panel>
-
-  <!-- <FS:Zi> Dialog Stacking browser -->
-  <button
-   layout="topleft"
-   follows="right|bottom"
-   name="DialogStackButton"
-   visibility_control="DialogStackIconVisible"
-   image_selected="Icon_DialogStack"
-   image_unselected="Icon_DialogStack"   
-   width="24"
-   height="14"
-   right="-2"
-   bottom="-2" />
-  <!-- <FS:Zi> Dialog Stacking browser -->
-</panel>

From 718757724e388cb6495a487b1740144956c27ed9 Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sun, 2 Nov 2014 21:24:26 -0800
Subject: [PATCH 060/229] Fix: FSLatencyOneTimeFixRun can be set to true on
 first run regardless of the other conditions since in all other cases it will
 never apply in the future.

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

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 36dccfedcf..61b3ba1743 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3387,8 +3387,8 @@ bool LLAppViewer::initConfiguration()
         // Replace previously saved script dialog colors with new defaults, which happen to be the same as the group notice colors
         LLUIColorTable::instance().setColor("ScriptDialog", LLUIColorTable::instance().getColor("GroupNotifyDialogBG", LLColor4::grey4));
         LLUIColorTable::instance().setColor("ScriptDialogFg", LLUIColorTable::instance().getColor("GroupNotifyTextColor", LLColor4::white));
-        gSavedSettings.setBOOL("FSLatencyOneTimeFixRun", TRUE);
     }
+    gSavedSettings.setBOOL("FSLatencyOneTimeFixRun", TRUE);
     //</FS:KC>
 
 	// Let anyone else who cares know that we've populated our settings

From 070328324d8cad50e6d8ae0491cd710e0e5df70e Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sun, 2 Nov 2014 21:36:28 -0800
Subject: [PATCH 061/229] Revert accidental indent change.

---
 .../skins/default/xui/en/floater_script.xml   | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml
index 52d6010882..8384f94280 100755
--- a/indra/newview/skins/default/xui/en/floater_script.xml
+++ b/indra/newview/skins/default/xui/en/floater_script.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-	legacy_header_height="18"
-	background_visible="true"
-	background_opaque="true"
-	border_visible="false"
-	bg_opaque_image="none"
-	bg_alpha_image="none"
-	bg_alpha_color="ScriptDialog"
-	bg_opaque_color="ScriptDialog"
-	height="250"
-	layout="topleft"
-	name="script_floater"
-	can_dock="true"
-	can_minimize="true"
-	visible="false"
-	width="350"
-	can_resize="false"
-	min_width="350"
-	min_height="200">
+ legacy_header_height="18"
+ background_visible="true"
+ background_opaque="true"
+ border_visible="false"
+ bg_opaque_image="none"
+ bg_alpha_image="none"
+ bg_alpha_color="ScriptDialog"
+ bg_opaque_color="ScriptDialog"
+ height="250"
+ layout="topleft"
+ name="script_floater"
+ can_dock="true"
+ can_minimize="true"
+ visible="false"
+ width="350"
+ can_resize="false"
+ min_width="350"
+ min_height="200">
 </floater>

From 9675b6248f03a6f6708de6c8124a83e0e9cf14cd Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sun, 2 Nov 2014 22:30:26 -0800
Subject: [PATCH 062/229] Fix: FIRE-11579 [LATENCY] Names in radar and people
 floater are white. They are now TextFgColor, black.

---
 indra/newview/skins/latency/colors.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/newview/skins/latency/colors.xml b/indra/newview/skins/latency/colors.xml
index f5aedbea66..a8caa1e5fd 100644
--- a/indra/newview/skins/latency/colors.xml
+++ b/indra/newview/skins/latency/colors.xml
@@ -339,6 +339,9 @@
       name="ScriptSelectedColor"
       reference="TextBgSelectedColor" />
 
+    <color
+     name="AvatarListItemIconDefaultColor"
+     reference="TextFgColor" />
 
 
 </colors>

From 15ec19c80fe7566020de4678702bb3be122911eb Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Mon, 3 Nov 2014 09:48:15 -0800
Subject: [PATCH 063/229] [Fire:14909] Add AMD R2/4/6/8 and GeForce 970/980
 GPUs to GPU table

---
 indra/newview/gpu_table.txt | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 62435e677e..80233f5ad0 100755
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -140,9 +140,14 @@ ATI Radeon HD 8600D/G/M					.*ATI.*AMD Radeon.* (HD|HD )86..[DGM].*				4	1	0	4.2
 ATI Radeon HD 8700D/G/M					.*ATI.*AMD Radeon.* (HD|HD )87..[DGM].*				4	1	0	4.2
 ATI Radeon HD 8800D/G/M					.*ATI.*AMD Radeon.* (HD|HD )88..[DGM].*				4	1	0	4.2
 ATI Radeon HD 8900D/G/M					.*ATI.*AMD Radeon.* (HD|HD )89..[DGM].*				4	1	0	4.2
+ATI Radeon R2 Mobile Series				.*ATI.*AMD Radeon.* R2 M2\d\d.*						2	1	0	4.2
+ATI Radeon R3 Mobile Series				.*ATI.*AMD Radeon.* R3 M2\d\d.*						3	1	0	4.2
+ATI Radeon R4 Mobile Series				.*ATI.*AMD Radeon.* R4 M2\d\d.*						3	1	0	4.2
 ATI Radeon R5 Mobile Series				.*ATI.*AMD Radeon.* R5 M2\d\d.*						3	1	0	4.2
+ATI Radeon R6 Mobile Series				.*ATI.*AMD Radeon.* R6 M2\d\d.*						3	1	0	4.2
 ATI Radeon R7 Mobile Series				.*ATI.*AMD Radeon.* R7 M2\d\d.*						4	1	0	4.2
-ATI Radeon R9 Mobile Series				.*ATI.*AMD Radeon.* R9 M2\d\d.*						4	1	0	4.2
+ATI Radeon R8 Mobile Series				.*ATI.*AMD Radeon.* R8 M2\d\d.*						4	1	0	4.2
+ATI Radeon R9 Mobile Series				.*ATI.*AMD Radeon.* R9 M2\d\d.*						5	1	0	4.2
 AMD Radeon R5(TM) OEM Mobile Series		.*ATI.*AMD Radeon\(TM\).* R5 .*						3	1	0	4.2
 AMD Radeon R7(TM) OEM Mobile Series		.*ATI.*AMD Radeon\(TM\).* R7 .*						4	1	0	4.2
 AMD Radeon R9(TM) OEM Mobile Series		.*ATI.*AMD Radeon\(TM\).* R9 .*						4	1	0	4.2
@@ -204,10 +209,17 @@ ATI Radeon HD 8600 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)86.*				3	1	0	4.2
 ATI Radeon HD 8700 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)87.*				4	1	1	4.2
 ATI Radeon HD 8800 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)88.*				5	1	1	4.2
 ATI Radeon HD 8900 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)89.*				5	1	1	4.2
-AMD Radeon R3 Series					.*ATI.*(Radeon|ASUS).* R3.*							3	1	0	4.2
 AMD Radeon R5 200 Series				.*ATI.*(Radeon|ASUS).* R5 2[0-9].*					3	1	0	4.2
 AMD Radeon R7 200 Series				.*ATI.*(Radeon|ASUS).* R7 2[0-9].*					4	1	0	4.2
 AMD Radeon R9 200 Series				.*ATI.*(Radeon|ASUS).* R9 2[0-9].*					5	1	0	4.2
+AMD Radeon R2 Series					.*ATI.*(Radeon|ASUS).* R2.*							2	1	0	4.2
+AMD Radeon R3 Series					.*ATI.*(Radeon|ASUS).* R3.*							3	1	0	4.2
+AMD Radeon R4 Series					.*ATI.*(Radeon|ASUS).* R4.*							3	1	0	4.2
+AMD Radeon R5 Series					.*ATI.*(Radeon|ASUS).* R5.*							3	1	0	4.2
+AMD Radeon R6 Series					.*ATI.*(Radeon|ASUS).* R6.*							3	1	0	4.2
+AMD Radeon R7 Series					.*ATI.*(Radeon|ASUS).* R7.*							4	1	0	4.2
+AMD Radeon R8 Series					.*ATI.*(Radeon|ASUS).* R8.*							4	1	0	4.2
+AMD Radeon R9 Series					.*ATI.*(Radeon|ASUS).* R9.*							4	1	0	4.2
 ATI Radeon OpenGL						.*ATI.*Radeon OpenGL.*								0	0	0	0
 ATI Radeon 2100							.*ATI.*Radeon 21..									0	0	1	2.1
 ATI Radeon 3000							.*ATI.*Radeon 30..									0	0	1	4
@@ -469,6 +481,8 @@ NVIDIA GTX 850M							.*NVIDIA .*GTX *85[0-9]M.*							5	1	0	4.4
 NVIDIA GTX 860M							.*NVIDIA .*GTX *86[0-9]M.*							5	1	0	4.4
 NVIDIA GTX 870M							.*NVIDIA .*GTX *87[0-9]M.*							5	1	0	4.4
 NVIDIA GTX 880M							.*NVIDIA .*GTX *88[0-9]M.*							5	1	0	4.4
+NVIDIA GTX 970M							.*NVIDIA .*GTX *97[0-9]M.*							5	1	0	4.4
+NVIDIA GTX 980M							.*NVIDIA .*GTX *98[0-9]M.*							5	1	0	4.4
 NVIDIA G100								.*NVIDIA .*G10.*									3	1	1	3.3
 NVIDIA GT 120							.*NVIDIA .*GT 12.*									2	1	0	3.3
 NVIDIA GT 130							.*NVIDIA .*GT 13.*									2	1	0	3.3

From b3401576b9823d1dee14355e6814c996d48d6ce1 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 3 Nov 2014 20:22:51 +0100
Subject: [PATCH 064/229] Crashfix

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

diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 66d5f158f3..c7def870d4 100755
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1808,7 +1808,7 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
 		{
 			// Or check if they're listed in an active group session
 			LLIMSpeakerMgr* mgr = LLIMModel::instance().getSpeakerManager(LLIMMgr::computeSessionID(IM_SESSION_GROUP_START, group_id));
-			if ( (!mgr) && (mgr->findSpeaker(ejected_member_id).isNull()) )
+			if ( (!mgr) || (mgr->findSpeaker(ejected_member_id).isNull()) )
 			{
 				continue;
 			}

From ba301f3bb4b29dbaa6693e85ffa62c3da61f2bdf Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Tue, 4 Nov 2014 00:27:38 -0800
Subject: [PATCH 065/229] Possible crashfix on disconnect

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

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 10e26b08a2..f5bdb807d8 100755
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2429,7 +2429,10 @@ void LLFloaterView::restoreAll()
 	for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
 	{
 		LLFloater* floaterp = (LLFloater*)*child_it;
-		floaterp->setMinimized(FALSE);
+		if (floaterp) //<FS:KC> Possible fix for crash on disconnect
+		{
+			floaterp->setMinimized(FALSE);
+		}
 	}
 
 	// *FIX: make sure dependents are restored

From 470f3ba9189cff09d4bf2101b8fdfad126503ce5 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 4 Nov 2014 11:57:32 +0100
Subject: [PATCH 066/229] Tip to default branch.

---
 README_BUILD_FIRESTORM_WIN32.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README_BUILD_FIRESTORM_WIN32.txt b/README_BUILD_FIRESTORM_WIN32.txt
index aaf4c73734..935e031930 100755
--- a/README_BUILD_FIRESTORM_WIN32.txt
+++ b/README_BUILD_FIRESTORM_WIN32.txt
@@ -32,9 +32,9 @@ After launching the VS2010 cmd shell and navigating to your firestorm code repo:
 
 Other build targets you may use are:
 
-	ReleaseFS		(includes KDU, FMOD)
-	ReleaseFS_open		(no KDU, no FMOD)
-	RelWithDebInfoFS_open	(no KDU, no FMOD)
+	ReleaseFS (includes KDU, FMOD)
+	ReleaseFS_open (no KDU, no FMOD)
+	RelWithDebInfoFS_open (no KDU, no FMOD)
 
 Other examples:
         autobuild configure -c ReleaseFS                    # basic configuration step, don't build, just configure

From 9befa8c6afb2c5cce8905063b7d9e1c899af4e59 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 4 Nov 2014 16:12:06 +0100
Subject: [PATCH 067/229] Move tip to default branch.

---
 README_BUILD_FIRESTORM_LINUX.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README_BUILD_FIRESTORM_LINUX.txt b/README_BUILD_FIRESTORM_LINUX.txt
index 3416b7ba48..1ddeec850d 100755
--- a/README_BUILD_FIRESTORM_LINUX.txt
+++ b/README_BUILD_FIRESTORM_LINUX.txt
@@ -18,9 +18,9 @@ mailing list. We've created a non-KDU build target to make this easier. Everywhe
 
 Available premade firestorm-specific build targets:
 
-	ReleaseFS		(includes KDU, FMOD)
-	ReleaseFS_open		(no KDU, no FMOD)
-	RelWithDebInfoFS_open	(no KDU, no FMOD)
+	ReleaseFS (includes KDU, FMOD)
+	ReleaseFS_open (no KDU, no FMOD)
+	RelWithDebInfoFS_open (no KDU, no FMOD)
 
 To build firestorm:
 

From 95e5effdab29dca929cfb16353345de6dd1f1341 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Wed, 5 Nov 2014 20:06:24 +0100
Subject: [PATCH 068/229] Polish translation tune-up

---
 .../skins/default/xui/pl/floater_fs_search.xml       |  2 +-
 .../skins/default/xui/pl/floater_joystick.xml        |  1 -
 .../skins/default/xui/pl/floater_perm_prefs.xml      |  2 +-
 .../skins/default/xui/pl/floater_report_abuse.xml    |  5 +----
 .../skins/default/xui/pl/floater_snapshot.xml        |  8 ++++----
 .../skins/default/xui/pl/floater_world_map.xml       | 12 ------------
 .../skins/default/xui/pl/panel_classified_info.xml   |  8 ++++----
 .../skins/default/xui/pl/panel_edit_profile.xml      |  4 ++--
 .../xui/pl/panel_fs_search_legacy_classifieds.xml    |  2 +-
 .../skins/default/xui/pl/panel_outfit_edit.xml       |  6 +++---
 indra/newview/skins/default/xui/pl/panel_people.xml  | 10 +++++-----
 .../default/xui/pl/panel_prim_media_controls.xml     |  8 ++++----
 .../skins/default/xui/pl/sidepanel_inventory.xml     | 10 +++++++---
 .../skins/default/xui/pl/sidepanel_item_info.xml     |  2 +-
 .../skins/default/xui/pl/sidepanel_task_info.xml     |  4 ++--
 15 files changed, 36 insertions(+), 48 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/floater_fs_search.xml b/indra/newview/skins/default/xui/pl/floater_fs_search.xml
index b07f31abc4..77acd9eb23 100644
--- a/indra/newview/skins/default/xui/pl/floater_fs_search.xml
+++ b/indra/newview/skins/default/xui/pl/floater_fs_search.xml
@@ -19,7 +19,7 @@
 		Wiek: [AGE]
 	</floater.string>
 	<floater.string name="string.listing_price">
-		Cena wyświetlenia: [LISTING_PRICE]
+		Koszt listowania: [LISTING_PRICE]
 	</floater.string>
 	<floater.string name="string.duration">
 		Czas trwania: [DURATION]
diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml
index d3696787b5..c3345f97eb 100755
--- a/indra/newview/skins/default/xui/pl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml
@@ -74,6 +74,5 @@
 		Tolerancja powiększania
 	</text>
 	<button label="Ustawienia domyślne" name="SpaceNavigatorDefaults"/>
-	<button label="OK" label_selected="OK" name="ok_btn"/>
 	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
index 6c40822bf7..aa635c4677 100755
--- a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
@@ -8,7 +8,7 @@
 		</text>
 		<check_box label="Modyfikacja" name="next_owner_modify"/>
 		<check_box label="Kopiowanie" name="next_owner_copy"/>
-		<check_box label="Oddawanie/Sprzedaż" name="next_owner_transfer"/>
+		<check_box label="Transferowanie" name="next_owner_transfer"/>
 	</panel>
 	<button label="Anuluj" label_selected="Anuluj" name="cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
index 1ad6af3766..35dc64f5dd 100755
--- a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
@@ -7,9 +7,6 @@
 	<text name="reporter_title">
 		Zgłasza:
 	</text>
-	<text name="sim_field">
-		Nazwa Regionu
-	</text>
 	<text name="pos_title">
 		Pozycja:
 	</text>
@@ -32,7 +29,7 @@
 		<combo_box.item label="Napaść &gt; Bezpieczny obszar" name="Assault__Safe_area"/>
 		<combo_box.item label="Napaść &gt; Piaskownica do testowania broni" name="Assault__Weapons_testing_sandbox"/>
 		<combo_box.item label="Handel &gt; Niedostarczenie produktu lub usługi" name="Commerce__Failure_to_deliver_product_or_service"/>
-		<combo_box.item label="Prywatność &gt; Dane osobiste" name="Disclosure__Real_world_information"/>
+		<combo_box.item label="Prywatność &gt; Dane osobiste ze świata realnego" name="Disclosure__Real_world_information"/>
 		<combo_box.item label="Prywatność &gt; Zdalne monitorowanie czatu" name="Disclosure__Remotely_monitoring chat"/>
 		<combo_box.item label="Prywatność &gt; Dane z Second Life / Czatu / IM" name="Disclosure__Second_Life_information_chat_IMs"/>
 		<combo_box.item label="Zakłócanie spokoju &gt; Nieuczciwe używanie zasobów Regionu" name="Disturbing_the_peace__Unfair_use_of_region_resources"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_snapshot.xml
index d2e2526bce..7718ab573f 100755
--- a/indra/newview/skins/default/xui/pl/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pl/floater_snapshot.xml
@@ -4,7 +4,7 @@
 		nieznany
 	</floater.string>
 	<string name="postcard_progress_str">
-		Wysyłanie Email
+		Wysyłanie maila
 	</string>
 	<string name="facebook_progress_str">
 		Wysyłanie na Facebooka
@@ -31,7 +31,7 @@
 		Obraz załadowany na Flickr
 	</string>
 	<string name="postcard_succeeded_str">
-		Email wysłany
+		Mail wysłany
 	</string>
 	<string name="inventory_succeeded_str">
 		Zapisano do Szafy
@@ -46,7 +46,7 @@
 		Publikacja obrazu na kanale nie powiodła się.
 	</string>
 	<string name="postcard_failed_str">
-		Wysyłanie emaila nie powiodło się.
+		Wysyłanie maila nie powiodło się.
 	</string>
 	<string name="inventory_failed_str">
 		Zapis do Szafy nie powiódł się.
@@ -91,7 +91,7 @@
 		<check_box label="Interfejs" name="ui_check"/>
 		<check_box label="Stan L$" name="currency_check"/>
 		<check_box label="Obiekty HUD" name="hud_check"/>
-		<check_box label="Pełne okno" name="freeze_frame_check"/>
+		<check_box label="Wstrzymaj (pełny ekran)" name="freeze_frame_check"/>
 		<check_box label="Autoodświeżanie" name="auto_snapshot_check"/>
 	</panel>
 	<button name="advanced_options_btn" tool_tip="Opcje zaawansowane" />
diff --git a/indra/newview/skins/default/xui/pl/floater_world_map.xml b/indra/newview/skins/default/xui/pl/floater_world_map.xml
index 23167da05b..91cb93ca31 100755
--- a/indra/newview/skins/default/xui/pl/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pl/floater_world_map.xml
@@ -23,9 +23,6 @@
 				<text name="person_label">
 					Rezydent
 				</text>
-				<text name="infohub_label">
-					Infohub
-				</text>
 				<text name="land_sale_label">
 					Sprzedaż ziemi
 				</text>
@@ -42,15 +39,6 @@
 				<text name="events_label">
 					Wydarzenia:
 				</text>
-				<text name="pg_label">
-					General
-				</text>
-				<text name="events_mature_label">
-					Moderate
-				</text>
-				<text name="events_adult_label">
-					Adult
-				</text>
 			</panel>
 			<panel name="layout_panel_3">
 				<text name="find_on_map_label">
diff --git a/indra/newview/skins/default/xui/pl/panel_classified_info.xml b/indra/newview/skins/default/xui/pl/panel_classified_info.xml
index 5c5df065a3..dca5915203 100755
--- a/indra/newview/skins/default/xui/pl/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/pl/panel_classified_info.xml
@@ -21,14 +21,14 @@
 			<text name="classified_location_label" value="Miejsce:"/>
 			<text name="content_type_label" value="Zawartość:"/>
 			<text name="category_label" value="Kategoria:"/>
-			<text name="creation_date_label" value="Data stworzenia:"/>
-			<text_editor name="creation_date" tool_tip="Data stworzenia"/>
-			<text name="price_for_listing_label" value="Cena wyświetlenia:"/>
+			<text name="creation_date_label" value="Data utworzenia:"/>
+			<text_editor name="creation_date" tool_tip="Data utworzenia"/>
+			<text name="price_for_listing_label" value="Koszt listowania:"/>
 			<text_editor name="price_for_listing" tool_tip="Cena za umieszczenie reklamy."/>
 			<layout_stack name="descr_stack">
 				<layout_panel name="clickthrough_layout_panel">
 					<text name="click_through_label" value="Kliknięcia:"/>
-					<text_editor name="click_through_text" tool_tip="Kliknij według daty"/>
+					<text_editor name="click_through_text" tool_tip="Współczynnik klikalności"/>
 				</layout_panel>
 				<layout_panel name="price_layout_panel">
 					<text name="auto_renew_label" value="Autoprzedłużanie:"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
index 7790afc934..0fa4f5bae4 100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
@@ -28,7 +28,7 @@
 			</panel>
 			<check_box label="Pokaż w wyszukiwarce" name="show_in_search_checkbox"/>
 			<text name="title_acc_status_text" value="Konto:"/>
-			<text_editor name="acc_status_text" value="Rezydent. Brak danych konta."/>
+			<text_editor name="acc_status_text" value="Rezydent. Płatności: Dane nieznane."/>
 			<text name="my_account_link" value="[[URL] Idź do Tablicy]"/>
 			<text name="title_partner_text" value="Partner:"/>
 			<panel name="partner_data_panel">
@@ -42,7 +42,7 @@
 				<icon name="real_world_edit_icon" tool_tip="Kliknij, aby wybrać obrazek"/>
 			</panel>
 			<text name="title_homepage_text">
-				WWW:
+				Strona www:
 			</text>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/pl/panel_fs_search_legacy_classifieds.xml b/indra/newview/skins/default/xui/pl/panel_fs_search_legacy_classifieds.xml
index 44c9ba7441..85fa16556a 100644
--- a/indra/newview/skins/default/xui/pl/panel_fs_search_legacy_classifieds.xml
+++ b/indra/newview/skins/default/xui/pl/panel_fs_search_legacy_classifieds.xml
@@ -8,7 +8,7 @@
 	<panel name="panel_ls_scrolllist">
 		<scroll_list name="search_results_classifieds">
 			<columns label="Nazwa" name="classified_name" />
-			<columns label="Cena wyświetlenia" name="price" />
+			<columns label="Koszt listowania" name="price" />
 		</scroll_list>
 		<button label="Wstecz" name="classifieds_back" />
 		<button label="Dalej" name="classifieds_next" />
diff --git a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
index 5639bcd7f9..37a91727d9 100755
--- a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
@@ -11,7 +11,7 @@
 	<string name="Filter.Objects" value="Obiekty"/>
 	<string name="Filter.Clothing" value="Ubranie"/>
 	<string name="Filter.Bodyparts" value="Części ciała"/>
-	<string name="replace_body_part" value="Kliknij aby zastąpić Twój obecny ksztalt"/>
+	<string name="replace_body_part" value="Kliknij aby zastąpić Twój obecny kształt"/>
 	<text name="title" value="Edytuj strój"/>
 	<panel name="header_panel">
 		<panel name="outfit_name_and_status">
@@ -34,10 +34,10 @@
 		</layout_panel>
 	</layout_stack>
 	<panel name="no_add_wearables_button_bar">
-		<button name="shop_btn_1" tool_tip="Odwiedź stronę SL Marketplace. Możesz również zaznaczyć rzecz, którą masz na sobie a następnie kliknąć tutaj aby zobaczyć więcej rzeczy tego rodzaju."/>
+		<button name="shop_btn_1" tool_tip="Odwiedź stronę SL Marketplace. Możesz również zaznaczyć rzecz, którą masz na sobie, a następnie kliknąć tutaj aby zobaczyć więcej rzeczy tego rodzaju."/>
 	</panel>
 	<panel name="add_wearables_button_bar">
-		<button name="shop_btn_2" tool_tip="Odwiedź stronę SL Marketplace. Możesz również zaznaczyć rzecz, którą masz na sobie a następnie kliknąć tutaj aby zobaczyć więcej rzeczy tego rodzaju."/>
+		<button name="shop_btn_2" tool_tip="Odwiedź stronę SL Marketplace. Możesz również zaznaczyć rzecz, którą masz na sobie, a następnie kliknąć tutaj aby zobaczyć więcej rzeczy tego rodzaju."/>
 	</panel>
 	<panel name="save_revert_button_bar">
 		<layout_stack name="button_bar_ls">
diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml
index 6b85d8adc5..d2b63d5b63 100755
--- a/indra/newview/skins/default/xui/pl/panel_people.xml
+++ b/indra/newview/skins/default/xui/pl/panel_people.xml
@@ -32,7 +32,7 @@ Chcesz spotkać ludzi? Spróbuj użyć [secondlife:///app/worldmap Mapy Świata]
 	</panel.string>
 	<tab_container name="tabs">
 		<panel label="W pobliżu" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
+			<panel name="nearby_buttons_panel">
 				<filter_editor label="Filtruj ludzi" name="nearby_filter_input" />
 				<button name="gear_btn" tool_tip="Akcje dotyczące wybranej osoby" />
 				<menu_button name="nearby_view_btn" tool_tip="Opcje widoku/sortowania" />
@@ -41,7 +41,7 @@ Chcesz spotkać ludzi? Spróbuj użyć [secondlife:///app/worldmap Mapy Świata]
 			</panel>
 		</panel>
 		<panel label="Znajomi" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
+			<panel name="friends_buttons_panel">
 				<filter_editor label="Filtruj ludzi" name="friends_filter_input" />
 				<button name="gear_btn" tool_tip="Akcje dotyczące wybranej osoby" />
 				<menu_button name="friends_view_btn" tool_tip="Opcje widoku/sortowania" />
@@ -56,11 +56,11 @@ Chcesz spotkać ludzi? Spróbuj użyć [secondlife:///app/worldmap Mapy Świata]
 			</tab_container>
 		</panel>
 		<panel label="Grupy" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
+			<panel name="groups_buttons_panel">
 				<filter_editor label="Filtruj grupy" name="groups_filter_input" />
 				<menu_button name="groups_gear_btn" tool_tip="Akcje dotyczące wybranej grupy" />
 				<menu_button name="groups_view_btn" tool_tip="Opcje widoku/sortowania" />
-				<menu_button name="plus_btn" tool_tip="Dołącz do grupy/Stwórz nową grupę" />
+				<menu_button name="plus_btn" tool_tip="Dołącz do grupy / Stwórz nową grupę" />
 				<dnd_button name="minus_btn" tool_tip="Opuść wybraną grupę" />
 			</panel>
 			<text name="groupcount">
@@ -68,7 +68,7 @@ Chcesz spotkać ludzi? Spróbuj użyć [secondlife:///app/worldmap Mapy Świata]
 			</text>
 		</panel>
 		<panel label="Ostatnie" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
+			<panel name="recent_buttons_panel">
 				<filter_editor label="Filtruj ludzi" name="recent_filter_input" />
 				<button name="gear_btn" tool_tip="Akcje dotyczące wybranej osoby" />
 				<menu_button name="recent_view_btn" tool_tip="Opcje widoku/sortowania" />
diff --git a/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
index de017eeb30..beafcebfc2 100755
--- a/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
@@ -7,13 +7,13 @@
 	</layout_stack>
 	<layout_stack name="media_controls">
 		<layout_panel name="back">
-			<button name="back_btn" tool_tip="Przejdź do poprzedniego"/>
+			<button name="back_btn" tool_tip="Przejdź do poprzedniej strony"/>
 		</layout_panel>
 		<layout_panel name="fwd">
-			<button name="fwd_btn" tool_tip="Przejdź do następnego"/>
+			<button name="fwd_btn" tool_tip="Przejdź do następnej strony"/>
 		</layout_panel>
 		<layout_panel name="home">
-			<button name="home_btn" tool_tip="Strona domowa"/>
+			<button name="home_btn" tool_tip="Strona startowa"/>
 		</layout_panel>
 		<layout_panel name="media_stop">
 			<button name="media_stop_btn" tool_tip="Zatrzymaj media"/>
@@ -35,7 +35,7 @@
 			<icon name="media_secure_lock_flag" tool_tip="Bezpieczne przeglądanie"/>
 			<layout_stack name="media_address_url_icons">
 				<layout_panel name="media_address_url_icons_wl">
-					<icon name="media_whitelist_flag" tool_tip="Biała Lista aktywna"/>
+					<icon name="media_whitelist_flag" tool_tip="Biała lista aktywna"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
index 92e7998ee6..d0133f612e 100755
--- a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
@@ -4,13 +4,17 @@
 		<layout_stack name="inventory_layout_stack">
 			<layout_panel name="inbox_layout_panel">
 				<panel name="marketplace_inbox">
-					<string name="InboxLabelWithArg">Odebrane przedmioty ([NUM])</string>
-					<string name="InboxLabelNoArg">Odebrane przedmioty</string>
+					<string name="InboxLabelWithArg">
+						Odebrane przedmioty ([NUM])
+					</string>
+					<string name="InboxLabelNoArg">
+						Odebrane przedmioty
+					</string>
 					<button label="Odebrane przedmioty" name="inbox_btn"/>
 					<text name="inbox_fresh_new_count">
 						[NUM] nowe/y
 					</text>
-					<panel name="inbox_inventory_placeholder_panel" tool_tip="Przeciągnij przedmioty do swojej Szafy, aby je używać">
+					<panel name="inbox_inventory_placeholder_panel" tool_tip="Przeciągnij przedmioty do swojej Szafy, aby ich używać">
 						<text name="inbox_inventory_placeholder">
 							Rzeczy kupione na Marketplace będą tu dostarczane.
 						</text>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
index 535ced15a8..06e0c51096 100755
--- a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
@@ -60,7 +60,7 @@
 				</text>
 				<check_box label="Modyfikacja" name="CheckNextOwnerModify"/>
 				<check_box label="Kopiowanie" name="CheckNextOwnerCopy"/>
-				<check_box label="Transferowanie" name="CheckNextOwnerTransfer" tool_tip="Następny właściciel może oddawać lub sprzedawać ten obiekt"/>
+				<check_box label="Transferowanie" name="CheckNextOwnerTransfer" tool_tip="Następny właściciel może oddać lub sprzedać ten obiekt"/>
 			</panel>
 			<check_box label="Na sprzedaż" name="CheckPurchase"/>
 			<combo_box name="combobox sale copy">
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
index b458bb4ad9..a9c65130eb 100755
--- a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
@@ -87,9 +87,9 @@
 			<text name="GroupLabel">
 				Grupa:
 			</text>
-			<check_box label="Udostępnij" name="checkbox share with group" tool_tip="Udostępnij prawa do modyfikacji tego obiektu wszystkim osobom, które posiadają przywilej modyfikacji obiektów grupy. By ograniczyć, przypisz obiekt do grupy."/>
+			<check_box label="Udostępnij" name="checkbox share with group" tool_tip="Pozwól wszystkim osobom z ustawionej grupy na dzielenie prawa do modyfikacji dla tego obiektu. Musisz przypisać obiekt grupie aby aktywować ograniczenia wynikające z funkcji."/>
 			<text name="NextOwnerLabel">
-				Nast. Właściciel:
+				Nast. właściciel:
 			</text>
 			<check_box label="Modyfikacja" name="checkbox next owner can modify"/>
 			<check_box label="Kopiowanie" name="checkbox next owner can copy"/>

From a4a7efc52abc2b4032d97d6b30228bfd2e1baf8f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 6 Nov 2014 15:42:46 +0100
Subject: [PATCH 069/229] FIRE-14921: Menu search shows in mouselook

---
 indra/newview/llstatusbar.cpp                          | 10 +++++++++-
 indra/newview/llstatusbar.h                            |  1 +
 .../newview/skins/default/xui/en/panel_status_bar.xml  |  3 +--
 .../skins/starlight/xui/en/panel_status_bar.xml        |  3 +--
 .../skins/starlightcui/xui/en/panel_status_bar.xml     |  3 +--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index f3af33fb2e..c6bfa00c3c 100755
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -444,10 +444,11 @@ BOOL LLStatusBar::postBuild()
 	// <FS:ND> Hook up and init for filtering
 	mFilterEdit = getChild<LLSearchEditor>("search_menu_edit");
 	mSearchPanel = getChild<LLPanel>("menu_search_panel");
+	mSearchPanel->setVisible(gSavedSettings.getBOOL("FSMenuSearch"));
 	mFilterEdit->setKeystrokeCallback(boost::bind(&LLStatusBar::onUpdateFilterTerm, this));
 	mFilterEdit->setCommitCallback(boost::bind(&LLStatusBar::onUpdateFilterTerm, this));
 	collectSearchableItems();
-	gSavedSettings.getControl("FSMenuSearch")->getCommitSignal()->connect(boost::bind(&LLStatusBar::update, this));
+	gSavedSettings.getControl("FSMenuSearch")->getCommitSignal()->connect(boost::bind(&LLStatusBar::updateMenuSearchVisibility, this, _2));
 	// </FS:ND>
 
 	return TRUE;
@@ -608,6 +609,7 @@ void LLStatusBar::setVisibleForMouselook(bool visible)
 	mSGBandwidth->setVisible(visible && showNetStats);
 	mSGPacketLoss->setVisible(visible && showNetStats);
 	mBandwidthButton->setVisible(visible && showNetStats); // <FS:PP> FIRE-6287: Clicking on traffic indicator toggles Lag Meter window
+	mSearchPanel->setVisible(visible && gSavedSettings.getBOOL("FSMenuSearch"));
 	mTimeMediaPanel->setVisible(visible);
 	setBackgroundVisible(visible);
 }
@@ -1525,3 +1527,9 @@ void LLStatusBar::collectSearchableItems()
 	mSearchData->mRootMenu = pItem;
 	collectChildren( gMenuBarView, pItem );
 }
+
+void LLStatusBar::updateMenuSearchVisibility(const LLSD& data)
+{
+	mSearchPanel->setVisible(data.asBoolean());
+	update();
+}
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index 0757c50a8d..7cb3a16d21 100755
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -383,6 +383,7 @@ private:
 
 	nd::statusbar::SearchData *mSearchData;
 	void collectSearchableItems();
+	void updateMenuSearchVisibility(const LLSD& data);
 	// </FS:ND>
 };
 
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index b2feb9267f..c371d3dec1 100755
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -240,8 +240,7 @@
 	 name="menu_search_panel"
 	 background_opaque="true"
 	 background_visible="true"
-	 bg_opaque_color="MouseGray"
-	 visibility_control="FSMenuSearch">
+	 bg_opaque_color="MouseGray">
 		<search_editor
 		 clear_button_visible="true"
 		 follows="left|top"
diff --git a/indra/newview/skins/starlight/xui/en/panel_status_bar.xml b/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
index b6a34373a8..1bdb117054 100644
--- a/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
@@ -225,8 +225,7 @@
 	 name="menu_search_panel"
 	 background_opaque="true"
 	 background_visible="true"
-	 bg_opaque_color="MouseGray"
-	 visibility_control="FSMenuSearch">
+	 bg_opaque_color="MouseGray">
 		<search_editor
 		 clear_button_visible="true"
 		 follows="left|top"
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml b/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
index 1a3926f2bd..8675e0d6a1 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
@@ -223,8 +223,7 @@
 	 follows="right|top"
 	 name="menu_search_panel"
 	 background_opaque="false"
-	 background_visible="true"
-	 visibility_control="FSMenuSearch">
+	 background_visible="true">
 		<search_editor
 		 clear_button_visible="true"
 		 follows="left|top"

From 71b74685526592390c2b789a410c9fa77ecf3e19 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 6 Nov 2014 15:58:36 +0100
Subject: [PATCH 070/229] FIRE-14917: Allow searching for complete avatar name
 in group member filter (same format that is actually displayed)

---
 indra/newview/llpanelgrouproles.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index e6e06c59d2..8410f1a2aa 100755
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -1697,7 +1697,7 @@ void LLPanelGroupMembersSubTab::onNameCache(const LLUUID& update_id, LLGroupMemb
 	// trying to avoid unnecessary hash lookups
 	// <FS:CR> FIRE-11350
 	//if (matchesSearchFilter(av_name.getAccountName()))
-	if (matchesSearchFilter(av_name.getUserName()))
+	if (matchesSearchFilter(av_name.getCompleteName()))
 	// </FS:CR>
 	{
 		addMemberToList(member);
@@ -1754,7 +1754,7 @@ void LLPanelGroupMembersSubTab::updateMembers()
 		{
 			// <FS:CR> FIRE-11350
 			//if (matchesSearchFilter(av_name.getAccountName()))
-			if (matchesSearchFilter(av_name.getUserName()))
+			if (matchesSearchFilter(av_name.getCompleteName()))
 			// </FS:CR>
 			{
 				addMemberToList(mMemberProgress->second);

From bd82f76cb276814da85d0f1ab6a25220a96020f5 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Thu, 6 Nov 2014 22:33:29 +0100
Subject: [PATCH 071/229] Exposing LanguageIsPublic is Prefs -> Privacy

---
 .../xui/en/panel_preferences_privacy.xml      | 36 ++++++++++++-------
 .../xui/pl/panel_preferences_privacy.xml      |  1 +
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 79b2a73b93..7b96a792e2 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -92,7 +92,7 @@
     layout="topleft"
     left="30"
     name="online_visibility"
-    top_pad="3"
+    top_pad="2"
     width="350" />
       
    <check_box
@@ -102,7 +102,7 @@
     layout="topleft"
     left="30"
     name="voice_call_friends_only_check"
-    top_pad="3"
+    top_pad="2"
     width="350" />
     
    <check_box
@@ -113,7 +113,17 @@
     layout="topleft"
     left="30"
     name="auto_disengage_mic_check"
-    top_pad="3"
+    top_pad="2"
+    width="350" />
+
+   <check_box
+    control_name="LanguageIsPublic"
+    height="16"
+    label="Let scripted objects see my current language setting"
+    layout="topleft"
+    left="30"
+    name="LanguageIsPublic"
+    top_pad="2"
     width="350" />
 
    <check_box
@@ -123,7 +133,7 @@
     layout="topleft"
     left="30"
     name="Auto_Accept_New_Inventory"
-    top_pad="3"
+    top_pad="2"
     width="350" />
 
    <check_box
@@ -134,7 +144,7 @@
     left="30"
     name="FSUseLegacyInventoryAcceptMessages"
     tool_tip="If enabled, the viewer will only send accept and decline messages after pressing the according button. If disabled, the accept response will be sent automatically as soon as the inventory offer has been received. This option has no effect if inventory offers are accepted automatically."
-    top_pad="3"
+    top_pad="2"
     width="350" />
 
    <check_box
@@ -144,7 +154,7 @@
     layout="topleft"
     left="30"
     name="Show_In_Inventory"
-    top_pad="3"
+    top_pad="2"
     width="350" />
 
    <check_box
@@ -154,7 +164,7 @@
     layout="topleft"
     left="30"
     name="Show_New_Inventory"
-    top_pad="3"
+    top_pad="2"
     width="350" />
 
    <check_box
@@ -164,7 +174,7 @@
     layout="topleft"
     left="30"
     name="FSOpenInventoryAfterSnapshot"
-    top_pad="3"
+    top_pad="2"
     width="350" />
 
    <check_box
@@ -174,7 +184,7 @@
     layout="topleft"
     left="30"
     name="FSCreateGiveInventoryParticleEffect"
-    top_pad="3"
+    top_pad="2"
     width="350" />
 
    <check_box
@@ -184,7 +194,7 @@
     layout="topleft"
     left="30"
     name="favorites_on_login_check"
-    top_pad="3"
+    top_pad="2"
     height="16"
     width="350" />
         
@@ -292,7 +302,7 @@
      left="30"
      name="UseLegacyIMLogNames"
      tool_tip="If enabled, the legacy file name format for transcripts (User Name) will be used instead of new format (user_name)."
-     top_pad="3"
+     top_pad="2"
      height="16"
      width="350" />
    <check_box
@@ -302,7 +312,7 @@
      left="30"
      name="LogFileNamewithDate"
      tool_tip="Add date stamp to chat and IM logs with format chat-YYYY-MM-DD and 'IM file name'-YYYY-MM."
-     top_pad="3"
+     top_pad="2"
      height="16"
      width="350" />
    <check_box
@@ -312,7 +322,7 @@
      left="30"
      name="FSUseBuiltInHistory"
      tool_tip="Uses the built-in transcript viewer for reading transcripts. If disabled, transcripts will open in your operating system's defined text editor."
-     top_pad="3"
+     top_pad="2"
      height="16"
      width="350" />
 
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 65a6991054..a6ee19a8a8 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
@@ -22,6 +22,7 @@
 			<check_box label="Mój status online dostępny tylko dla znajomych i grup" name="online_visibility"/>
 			<check_box label="Tylko znajomi i grupy mogą wysyłać do mnie wiadomości lub dzwonić głosowo" name="voice_call_friends_only_check"/>
 			<check_box label="Wyłącz mikrofon po zakończeniu rozmowy głosowej" name="auto_disengage_mic_check"/>
+			<check_box label="Pozwól oskryptowanym obiektom znać moje obecne ustawienie języka" name="LanguageIsPublic"/>
 			<check_box label="Automatycznie akceptuj nowe przedmioty" name="Auto_Accept_New_Inventory"/>
 			<check_box label="Klasyczne powiadomienia akceptacji/odrzucenia przedmiotu" name="FSUseLegacyInventoryAcceptMessages" tool_tip="Gdy włączysz tą opcję, to Przeglądarka będzie wysyłać powiadomienia o akceptacji/odrzuceniu przedmiotu tylko po naciśnięciu odpowiedniego przycisku. Gdy wyłączysz tą opcję, to powiadomienie będzie wysłane automatycznie zaraz po tym, gdy przedmiot zostanie zaakceptowany. Ta opcja nie ma żadnej mocy, gdy przedmioty są akceptowane automatycznie."/>
 			<check_box label="Automatycznie pokazuj akceptowane przedmioty" name="Show_In_Inventory"/>

From 939897f4e52e3736086e6955de4a53afa9361cf4 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 6 Nov 2014 23:05:42 +0100
Subject: [PATCH 072/229] Updated German translation

---
 .../skins/default/xui/de/panel_preferences_privacy.xml        | 4 +---
 .../skins/default/xui/en/panel_preferences_privacy.xml        | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
index c28c0f9b7f..5e562ce287 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
@@ -23,9 +23,7 @@
 			<check_box label="Nur Freunde und Gruppen wissen, dass ich online bin" name="online_visibility"/>
 			<check_box label="Nur Freunde und Gruppen können mich anrufen oder mir eine IM schicken" name="voice_call_friends_only_check"/>
 			<check_box label="Mikrofon ausschalten, wenn Anrufe beendet werden" name="auto_disengage_mic_check"/>
-			<check_box label="Kamerafokus anderen nicht anzeigen" name="privatelookat"/>
-			<check_box label="Kamerafokus auch lokal nicht anzeigen" name="privateLocalLookat"/>
-			<check_box label="Auswahl Ziel nicht anzeigen" name="privatepointat"/>
+			<check_box label="Objekten erlauben, die aktuelle Spracheinstellung abzufragen" name="LanguageIsPublic"/>
 			<check_box label="Automatisches Akzeptieren von Inventar-Angeboten" name="Auto_Accept_New_Inventory"/>
 			<check_box label="Klassische Annahme/Ablehnungs-Nachrichten für Inventar-Angebote verwenden" name="FSUseLegacyInventoryAcceptMessages" tool_tip="Falls aktiviert, werden Annahme- bzw. Ablehnungs-Nachrichten erst verschickt, wenn der entsprechende Button angeklickt wurde. Falls deaktiviert, wird automatisch eine Annahme-Nachricht verschickt, sobald das angebotene Objekt im Inventar eingetroffen ist. Diese Option hat keinen Effekt, wenn Inventar-Angebote automatisch akzeptiert werden."/>
 			<check_box label="Automatisch empfangene Objekte im Inventar anzeigen" name="Show_In_Inventory"/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 7b96a792e2..bedeb179e3 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -55,7 +55,7 @@
     layout="topleft"
     left="30"
     name="clear_cache"
-    top_pad="10"
+    top_pad="8"
     width="145">
     <button.commit_callback
      function="Pref.WebClearCache" />
@@ -82,7 +82,7 @@
     layout="topleft"
     left="30"
     name="online_searchresults"
-    top_pad="10"
+    top_pad="8"
     width="350" />
 
    <check_box

From 160555a3e2ca82e134c3252b3e18dc5ad0922ee8 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Thu, 6 Nov 2014 23:26:00 +0100
Subject: [PATCH 073/229] Polish translation tune-up

---
 .../default/xui/pl/floater_about_land.xml     | 42 +++++------------
 .../default/xui/pl/floater_avatar_picker.xml  |  1 -
 .../default/xui/pl/floater_bulk_perms.xml     |  5 +-
 .../skins/default/xui/pl/floater_buy_land.xml |  2 +-
 .../default/xui/pl/floater_choose_group.xml   |  3 +-
 .../default/xui/pl/floater_color_picker.xml   |  1 -
 .../skins/default/xui/pl/floater_gesture.xml  |  2 +-
 .../xui/pl/floater_hardware_settings.xml      |  1 -
 .../default/xui/pl/floater_im_container.xml   |  2 +-
 .../default/xui/pl/floater_image_preview.xml  | 20 ++++----
 .../xui/pl/floater_inventory_view_finder.xml  |  2 +-
 .../skins/default/xui/pl/menu_viewer.xml      | 47 +++++++++----------
 .../latency/xui/pl/floater_about_land.xml     | 42 +++++------------
 .../vintage/xui/pl/floater_about_land.xml     | 42 +++++------------
 .../vintage/xui/pl/sidepanel_inventory.xml    | 10 ++--
 15 files changed, 82 insertions(+), 140 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml
index 711b062c2a..dfeb44c087 100755
--- a/indra/newview/skins/default/xui/pl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml
@@ -7,10 +7,10 @@
 		minuta
 	</floater.string>
 	<floater.string name="Seconds">
-		[SECONDS] sekundy
+		[SECONDS] sekund
 	</floater.string>
 	<floater.string name="Remaining">
-		pozostały
+		pozostało
 	</floater.string>
 	<tab_container name="landtab">
 		<panel label="Ogólne" name="land_general_panel">
@@ -24,7 +24,7 @@
 				Obszar
 			</panel.string>
 			<panel.string name="auction_id_text">
-				Numer aukcji: [ID]
+				ID aukcji: [ID]
 			</panel.string>
 			<panel.string name="need_tier_to_modify">
 				Musisz zaakceptować zakup by móc modyfikować tą działkę.
@@ -50,9 +50,6 @@
 			<panel.string name="no_selection_text">
 				Nie wybrano działki.
 			</panel.string>
-			<panel.string name="time_stamp_template">
-				[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
-			</panel.string>
 			<panel.string name="error_resolving_uuid">
 				Numer identyfikacyjny UUID działki nie został rozpoznany.
 			</panel.string>
@@ -68,15 +65,9 @@
 			<text name="LandType">
 				Typ:
 			</text>
-			<text name="LandTypeText">
-				Mainland / Homestead
-			</text>
 			<text name="ContentRating">
 				Rodzaj:
 			</text>
-			<text name="ContentRatingText">
-				Adult
-			</text>
 			<text name="Owner:">
 				Właściciel:
 			</text>
@@ -97,7 +88,7 @@
 				Na sprzedaż:
 			</text>
 			<text name="Not for sale.">
-				Nie
+				Nie na sprzedaż
 			</text>
 			<text name="For Sale: Price L$[PRICE].">
 				Cena: [PRICE]L$ ([PRICE_PER_SQM]L$/m²).
@@ -129,7 +120,7 @@
 			<button label="Sprzedaż przez Lindenów" name="Linden Sale..." tool_tip="Działka musi mieć Właściciela, zawartość oraz nie może być wystawiona na Aukcję."/>
 			<button label="Skrypty" name="Scripts..."/>
 			<button label="Kup dla Grupy" name="Buy For Group..."/>
-			<button label="Kup Przepustkę" label_selected="Kup Przepustkę" name="Buy Pass..." tool_tip="Przepustka udostępnia tymczasowy wstęp na działkę."/>
+			<button label="Kup Przepustkę" name="Buy Pass..." tool_tip="Przepustka udostępnia tymczasowy wstęp na działkę."/>
 			<button label="Porzuć działkę" name="Abandon Land..."/>
 			<button label="Odzyskaj działkę" name="Reclaim Land..."/>
 		</panel>
@@ -165,24 +156,15 @@
 			<text name="covenant_timestamp_text">
 				Ostatnia modyfikacja Wed Dec 31 16:00:00 1969
 			</text>
-			<text name="region_section_lbl">
-				Region:
-			</text>
 			<text name="region_name_text">
 				Wczytywanie...
 			</text>
 			<text name="region_landtype_lbl">
 				Typ:
 			</text>
-			<text name="region_landtype_text">
-				Mainland / Homestead
-			</text>
 			<text name="region_maturity_lbl">
 				Rodzaj:
 			</text>
-			<text name="region_maturity_text">
-				Adult
-			</text>
 			<text name="resellable_lbl">
 				Odsprzedaj:
 			</text>
@@ -208,7 +190,7 @@
 				Ilość ekstra obiektów: [BONUS]
 			</text>
 			<text name="Simulator primitive usage:">
-				Ilość używanych primów:
+				Pojemność regionu:
 			</text>
 			<text name="objects_available">
 				[COUNT] z [MAX] ([AVAILABLE] jest dostępnych)
@@ -248,7 +230,7 @@
 			<name_list name="owner list">
 				<name_list.columns label="Typ" name="type"/>
 				<name_list.columns label="Nazwa" name="name"/>
-				<name_list.columns label="Liczba" name="count"/>
+				<name_list.columns label="Ilość" name="count"/>
 				<name_list.columns label="Najnowsze" name="mostrecent"/>
 			</name_list>
 		</panel>
@@ -273,7 +255,7 @@ Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
 				Twoja działka bądź treść jaką zawiera klasyfikowana jest jako Moderate.
 			</panel.string>
 			<panel.string name="mature_check_adult_tooltip">
-				Informacje o Twojej działce i treści jaką zawiera klasyfikowane są jako Adult.
+				Twoja działka bądź treść jaką zawiera klasyfikowana jest jako Adult.
 			</panel.string>
 			<panel.string name="landing_point_none">
 				(brak)
@@ -361,7 +343,7 @@ Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
 				<combo_box.item label="Gdziekolwiek" name="Anywhere"/>
 			</combo_box>
 		</panel>
-		<panel label="Media" name="land_media_panel">
+		<panel name="land_media_panel">
 			<text name="with media:">
 				Typ mediów:
 			</text>
@@ -394,7 +376,7 @@ teksturę:
 			<text name="Options:">
 				Opcje:
 			</text>
-			<check_box label="Powtarzaj odtwarzanie" name="media_loop" tool_tip="Powtarzaj odtwarzanie mediów w pętli. Po wyświetleniu materiału odtwarzanie rozpocznie się od początku."/>
+			<check_box label="Odtwarzaj w pętli" name="media_loop" tool_tip="Powtarzaj odtwarzanie mediów w pętli. Po wyświetleniu materiału odtwarzanie rozpocznie się od początku."/>
 		</panel>
 		<panel label="Dźwięk" name="land_audio_panel">
 			<text name="MusicURL:">
@@ -430,8 +412,8 @@ teksturę:
 			<text name="Only Allow">
 				Umożliwiaj dostęp tylko dla:
 			</text>
-			<check_box label="Rezydentów zarejestrowanych w systemie płatniczym Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Zbanuj Rezydentów niezarejestrowanych w systemie płatniczym Linden Lab."/>
-			<check_box label="Rezydentów, którzy mają 18+ lat [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Zbanuj Rezydetów, którzy mają mniej niż 18 lat. Odwiedź [SUPPORT_SITE] po więcej informacji."/>
+			<check_box label="Rezydentów zarejestrowanych w systemie płatniczym Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Zbanuj Rezydentów niezarejestrowanych w systemie płatniczym Linden Lab. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji."/>
+			<check_box label="Rezydentów, którzy mają 18+ lat [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Zbanuj Rezydetów, którzy mają mniej niż 18 lat. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji."/>
 			<check_box label="Udostępnij wejście grupie [GROUP]" name="GroupCheck" tool_tip="Ustaw Grupę w głównej zakładce."/>
 			<check_box label="Sprzedaj przepustki:" name="PassCheck" tool_tip="Otwórz tymczasowy dostęp do tej działki"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
index 6de61ef91b..36a8208dc9 100755
--- a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
@@ -58,6 +58,5 @@
 			</fs_avatar_search_list>
 		</panel>
 	</tab_container>
-	<button label="OK" label_selected="OK" name="ok_btn"/>
 	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml
index b182274226..d55baf5bc2 100755
--- a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml
@@ -21,8 +21,8 @@
 	<icon name="icon_script" tool_tip="Skrypty"/>
 	<icon name="icon_sound" tool_tip="Dźwięki"/>
 	<icon name="icon_texture" tool_tip="Tekstury"/>
-	<button font="SansSerifSmall" label="√ Wszystkie" name="check_all"/>
-	<button font="SansSerifSmall" label="Żadne" label_selected="Żadne" name="check_none"/>
+	<button label="√ Wszystkie" name="check_all"/>
+	<button label="Żadne" label_selected="Żadne" name="check_none"/>
 	<text name="newperms">
 		Reguluj prawa zawartości na
 	</text>
@@ -40,7 +40,6 @@
 	<check_box label="Modyfikacja" name="next_owner_modify"/>
 	<check_box label="Kopiowanie" name="next_owner_copy"/>
 	<check_box label="Transferowanie" name="next_owner_transfer" tool_tip="Następny Właściciel może oddać lub sprzedać ten obiekt."/>
-	<button label="OK" name="ok"/>
 	<button label="Zastosuj" name="apply"/>
 	<button label="Anuluj" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_land.xml b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
index a697181746..aac4a3049c 100755
--- a/indra/newview/skins/default/xui/pl/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
@@ -46,7 +46,7 @@ Spróbuj wybrać ponownie mniejszą powierzchnię działki.
 	</floater.string>
 	<floater.string name="processing">
 		Przetwarzanie Twojego zakupu...
- 
+
 (Może zająć kilka minut)
 	</floater.string>
 	<floater.string name="fetching_error">
diff --git a/indra/newview/skins/default/xui/pl/floater_choose_group.xml b/indra/newview/skins/default/xui/pl/floater_choose_group.xml
index 051a119783..08eb037deb 100755
--- a/indra/newview/skins/default/xui/pl/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/pl/floater_choose_group.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="groups" title="Grupy">
 	<text name="groupdesc">
-		Wybierz Grupę:
+		Wybierz grupę:
 	</text>
-	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
index 0195abc58b..e224dfe5a8 100755
--- a/indra/newview/skins/default/xui/pl/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
@@ -40,7 +40,6 @@
 	</text>
 	<check_box label="Stosuj teraz" name="apply_immediate"/>
 	<button label="Kopia LSL" tool_tip="Kopiuje wartości koloru do formatu wektora kolorów LSL w postaci &lt;r, g, b&gt;." name="copy_lsl_btn"/>
-	<button label="OK" label_selected="OK" name="select_btn"/>
 	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
 	<text name="Current color:">
 		^ Obecny kolor ^
diff --git a/indra/newview/skins/default/xui/pl/floater_gesture.xml b/indra/newview/skins/default/xui/pl/floater_gesture.xml
index 01ced2ca40..febd568d12 100755
--- a/indra/newview/skins/default/xui/pl/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/pl/floater_gesture.xml
@@ -14,7 +14,7 @@
 		<scroll_list.columns label="Czat" name="trigger"/>
 		<scroll_list.columns label="Skrót" name="shortcut"/>
 	</scroll_list>
-	<panel label="bottom_panel" name="bottom_panel">
+	<panel name="bottom_panel">
 		<menu_button name="gear_btn" tool_tip="Więcej opcji"/>
 		<button name="new_gesture_btn" tool_tip="Stwórz nowy gest"/>
 		<button name="activate_btn" tool_tip="Aktywuj/Dezaktywuj wybrany gest"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
index 9748b427e7..739900e6db 100755
--- a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
@@ -26,5 +26,4 @@
 	<check_box label="Włącz kompresję tekstur (wymaga restartu)" name="texture compression" tool_tip="Kompresuje tekstury w pamięci wideo. Umożliwi to ładowanie tekstur w wyższej rozdzielczości / większej ich ilości, ale kosztem jakości obrazu."/>
 	<slider label="Bufor pamięci tekstur (MB):" name="GraphicsCardTextureMemory" tool_tip="Ilość pamięci przeznaczona na tekstury. Domyślnie jest to maksymalna wielkość pamięci karty graficznej, ale nie więcej niż 512 MB. Zmniejszenie tej wartości może spowodować wzrost wydajności, ale tekstury będą bardziej rozmazane. Zwiększanie tej wartości ponad 512 MB nie jest wskazane nawet, jeśli Twoja karta to obsługuje - ogólna wydajność Przeglądarki związana z pamięcią operacyjną widocznie spadnie."/>
 	<spinner label="Stosunek odległości dla mgły:" name="fog"/>
-	<button label="OK" label_selected="OK" name="OK"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_im_container.xml b/indra/newview/skins/default/xui/pl/floater_im_container.xml
index 807ad23537..9892e5dcb7 100755
--- a/indra/newview/skins/default/xui/pl/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/pl/floater_im_container.xml
@@ -18,7 +18,7 @@
 				<panel name="stub_panel">
 					<button name="stub_collapse_btn" tool_tip="Zwiń ten panel" />
 					<text name="stub_textbox">
-						Ta rozmowa jest w osobnym oknie.   [secondlife:/// Z powrotem.]
+						Ta rozmowa jest w osobnym oknie. [secondlife:/// Z powrotem.]
 					</text>
 				</panel>
 			</panel_container>
diff --git a/indra/newview/skins/default/xui/pl/floater_image_preview.xml b/indra/newview/skins/default/xui/pl/floater_image_preview.xml
index d324928f05..597c310c56 100755
--- a/indra/newview/skins/default/xui/pl/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_image_preview.xml
@@ -10,16 +10,16 @@
 		Wyświetl obraz jako:
 	</text>
 	<combo_box label="Rodzaj Ubrania" name="clothing_type_combo">
-		<item label="Obraz" name="Image" value="Obraz"/>
-		<item label="Włosy" name="Hair" value="Włosy"/>
-		<item label="Głowa kobiety" name="FemaleHead" value="Głowa kobiety"/>
-		<item label="Górna część ciała kobiety" name="FemaleUpperBody" value="Górna część ciała kobiety"/>
-		<item label="Dolna część ciała kobiety" name="FemaleLowerBody" value="Dolna część ciała kobiety"/>
-		<item label="Głowa mężczyzny" name="MaleHead" value="Głowa mężczyzny"/>
-		<item label="Górna część ciała mężczyzny" name="MaleUpperBody" value="Górna część ciała mężczyzny"/>
-		<item label="Dolna część ciała mężczyzny" name="MaleLowerBody" value="Dolna część ciała mężczyzny"/>
-		<item label="Spódnica" name="Skirt" value="Spódnica"/>
-		<item label="Prim skulptowy" name="SculptedPrim" value="Prim skulptowy"/>
+		<item label="Obraz" name="Image" />
+		<item label="Włosy" name="Hair" />
+		<item label="Głowa kobiety" name="FemaleHead" />
+		<item label="Górna część ciała kobiety" name="FemaleUpperBody" />
+		<item label="Dolna część ciała kobiety" name="FemaleLowerBody" />
+		<item label="Głowa mężczyzny" name="MaleHead" />
+		<item label="Górna część ciała mężczyzny" name="MaleUpperBody" />
+		<item label="Dolna część ciała mężczyzny" name="MaleLowerBody" />
+		<item label="Spódnica" name="Skirt" />
+		<item label="Prim skulptowy" name="SculptedPrim" />
 	</combo_box>
 	<text name="bad_image_text">
 		Nie można wczytać obrazu.
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
index eb941aeeae..d036e67c87 100755
--- a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
@@ -15,7 +15,7 @@
 	<button label="Wszystko" label_selected="Wszystko" name="All" />
 	<button label="Żadne" label_selected="Żadne" name="None" />
 	<check_box label="Zawsze pokaż foldery" name="check_show_empty" />
-	<check_box label="Od czasu wylogowania" name="check_since_logoff" />
+	<check_box label="Od wylogowania" name="check_since_logoff" />
 	<text name="- OR -">
 		- LUB -
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index 0397b5a032..368224945b 100755
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -80,7 +80,7 @@
 		<menu_item_call label="Osoby w pobliżu" name="Active Speakers"/>
 		<menu_item_check label="Radar" name="Radar"/>
 		<menu_item_call label="Historia teleportacji" name="Teleport History"/>
-		<menu_item_check label="Miejsca" name="Places"/>
+		<menu_item_check label="Landmarki" name="Places"/>
 		<menu_item_check label="Minimapa" name="Mini-Map"/>
 		<menu_item_check label="Mapa Świata" name="World Map"/>
 		<menu_item_call label="Zapamiętaj to miejsce (LM)" name="Create Landmark Here"/>
@@ -109,21 +109,21 @@
 		</menu>
 		<menu label="Edytor środowiska" name="Environment Editor">
 			<menu_item_call label="Ustawienia środowiska" name="Environment Settings"/>
-				<menu name="Water Presets" label="Ustawienia wody">
-					<menu_item_call label="Nowe Ustawienie..." name="new_water_preset"/>
-					<menu_item_call label="Edytuj Ustawienie..." name="edit_water_preset"/>
-					<menu_item_call label="Usuń Ustawienie..." name="delete_water_preset"/>
-				</menu>
-				<menu name="Sky Presets" label="Ustawienia nieba">
-					<menu_item_call label="Nowe Ustawienie..." name="new_sky_preset"/>
-					<menu_item_call label="Edytuj Ustawienie..." name="edit_sky_preset"/>
-					<menu_item_call label="Usuń Ustawienie..." name="delete_sky_preset"/>
-				</menu>
-				<menu name="Day Presets" label="Ustawienia pory dnia">
-					<menu_item_call label="Nowe Ustawienie..." name="new_day_preset"/>
-					<menu_item_call label="Edytuj Ustawienie..." name="edit_day_preset"/>
-					<menu_item_call label="Usuń Ustawienie..." name="delete_day_preset"/>
-				</menu>
+			<menu name="Water Presets" label="Ustawienia wody">
+				<menu_item_call label="Nowe Ustawienie..." name="new_water_preset"/>
+				<menu_item_call label="Edytuj Ustawienie..." name="edit_water_preset"/>
+				<menu_item_call label="Usuń Ustawienie..." name="delete_water_preset"/>
+			</menu>
+			<menu name="Sky Presets" label="Ustawienia nieba">
+				<menu_item_call label="Nowe Ustawienie..." name="new_sky_preset"/>
+				<menu_item_call label="Edytuj Ustawienie..." name="edit_sky_preset"/>
+				<menu_item_call label="Usuń Ustawienie..." name="delete_sky_preset"/>
+			</menu>
+			<menu name="Day Presets" label="Ustawienia pory dnia">
+				<menu_item_call label="Nowe Ustawienie..." name="new_day_preset"/>
+				<menu_item_call label="Edytuj Ustawienie..." name="edit_day_preset"/>
+				<menu_item_call label="Usuń Ustawienie..." name="delete_day_preset"/>
+			</menu>
 		</menu>
 		<menu name="photo_and_video" label="Foto i Wideo">
 			<menu_item_call label="Narzędzia fotograficzne" name="phototools_item_call"/>
@@ -306,7 +306,7 @@
 			<menu_item_check label="Trawa" name="Rendering Type Grass"/>
 			<menu_item_check label="Chmury" name="Rendering Type Clouds"/>
 			<menu_item_check label="Cząsteczki" name="Rendering Type Particles"/>
-			<menu_item_check label="Zderzenia" name="Rendering Type Bump"/>
+			<menu_item_check label="Mapping wypukłości i połysk" name="Rendering Type Bump"/>
 		</menu>
 		<menu label="Opcje renderowania" name="Rendering Features">
 			<menu_item_check label="Interfejs użytkownika" name="ToggleUI"/>
@@ -455,8 +455,8 @@
 		</menu>
 		<menu label="Sieć" name="Network">
 			<menu_item_check label="Zatrzymaj awatara" name="AgentPause"/>
-			<menu_item_call label="Włącz logowanie" name="Enable Message Log"/>
-			<menu_item_call label="Wyłącz logowanie" name="Disable Message Log"/>
+			<menu_item_call label="Włącz logowanie wiadomości" name="Enable Message Log"/>
+			<menu_item_call label="Wyłącz logowanie wiadomości" name="Disable Message Log"/>
 			<menu_item_check label="Prędkość interpolacji obiektów" name="Velocity Interpolate Objects"/>
 			<menu_item_check label="Pinguj pozycje interpolowanych obiektów" name="Ping Interpolate Object Positions"/>
 			<menu_item_call label="Zagub pakiet" name="Drop a Packet" shortcut=""/>
@@ -495,9 +495,7 @@
 			<menu_item_check label="Debuguj kliknięcia" name="Debug Clicks"/>
 			<menu_item_check label="Debuguj widoki" name="Debug Views"/>
 			<menu_item_check label="Debuguj chmurki dla podpowiedzi nazw" name="Debug Name Tooltips"/>
-			<menu_item_check label="Debuguj kliknięcia" name="Debug Clicks"/>
-			<menu_item_check label="Debuguj kliknięcia" name="Debug Clicks"/>
-			<menu_item_check label="Debuguj zdarzeń myszy" name="Debug Mouse Events"/>
+			<menu_item_check label="Debuguj zdarzenia myszy" name="Debug Mouse Events"/>
 			<menu_item_check label="Debuguj klawisze" name="Debug Keys"/>
 			<menu_item_check label="Debuguj procesy okien" name="Debug WindowProc"/>
 		</menu>
@@ -578,13 +576,13 @@
 			<menu_item_call label="Ustaw na własność Lindenów" name="Set to Linden Content"/>
 			<menu_item_call label="Zażądaj działki publicznej" name="Claim Public Land"/>
 		</menu>
-		<menu label="Region" name="Region">
+		<menu name="Region">
 			<menu_item_call label="Zrzuć tymczasowe informacje zasobów danych (assetów)" name="Dump Temp Asset Data"/>
 			<menu_item_call label="Zachowaj ustawienie Regionu" name="Save Region State"/>
 		</menu>
 		<menu_item_call label="Boskie narzędzia" name="God Tools"/>
 	</menu>
-	<menu label="Admin" name="Deprecated">
+	<menu name="Deprecated">
 		<menu label="Przyłącz obiekt" name="Attach Object"/>
 		<menu label="Odłącz obiekt" name="Detach Object"/>
 		<menu label="Zdejmij ubrania" name="Take Off Clothing">
@@ -597,7 +595,6 @@
 			<menu_item_call label="Podkoszulek" name="Menu Undershirt"/>
 			<menu_item_call label="Bielizna" name="Menu Underpants"/>
 			<menu_item_call label="Spódnica" name="Skirt"/>
-			<menu_item_call label="Alpha" name="Alpha"/>
 			<menu_item_call label="Tatuaż" name="Tattoo"/>
 			<menu_item_call label="Fizyka" name="Physics"/>
 			<menu_item_call label="Wszystkie ubrania" name="All Clothes"/>
diff --git a/indra/newview/skins/latency/xui/pl/floater_about_land.xml b/indra/newview/skins/latency/xui/pl/floater_about_land.xml
index 9e75c71ca4..fe33c56d1b 100644
--- a/indra/newview/skins/latency/xui/pl/floater_about_land.xml
+++ b/indra/newview/skins/latency/xui/pl/floater_about_land.xml
@@ -7,10 +7,10 @@
 		minuta
 	</floater.string>
 	<floater.string name="Seconds">
-		[SECONDS] sekundy
+		[SECONDS] sekund
 	</floater.string>
 	<floater.string name="Remaining">
-		pozostały
+		pozostało
 	</floater.string>
 	<tab_container name="landtab">
 		<panel label="Ogólne" name="land_general_panel">
@@ -24,7 +24,7 @@
 				Obszar
 			</panel.string>
 			<panel.string name="auction_id_text">
-				Numer aukcji: [ID]
+				ID aukcji: [ID]
 			</panel.string>
 			<panel.string name="need_tier_to_modify">
 				Musisz zaakceptować zakup by móc modyfikować tą działkę.
@@ -50,9 +50,6 @@
 			<panel.string name="no_selection_text">
 				Nie wybrano działki.
 			</panel.string>
-			<panel.string name="time_stamp_template">
-				[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
-			</panel.string>
 			<panel.string name="error_resolving_uuid">
 				Numer identyfikacyjny UUID działki nie został rozpoznany.
 			</panel.string>
@@ -68,15 +65,9 @@
 			<text name="LandType">
 				Typ:
 			</text>
-			<text name="LandTypeText">
-				Mainland / Homestead
-			</text>
 			<text name="ContentRating">
 				Rodzaj:
 			</text>
-			<text name="ContentRatingText">
-				Adult
-			</text>
 			<text name="Owner:">
 				Właściciel:
 			</text>
@@ -97,7 +88,7 @@
 				Na sprzedaż:
 			</text>
 			<text name="Not for sale.">
-				Nie
+				Nie na sprzedaż
 			</text>
 			<text name="For Sale: Price L$[PRICE].">
 				Cena: [PRICE]L$ ([PRICE_PER_SQM]L$/m²).
@@ -129,7 +120,7 @@
 			<button label="Sprzedaż przez Lindenów" name="Linden Sale..." tool_tip="Działka musi mieć Właściciela, zawartość oraz nie może być wystawiona na Aukcję."/>
 			<button label="Skrypty" name="Scripts..."/>
 			<button label="Kup dla Grupy" name="Buy For Group..."/>
-			<button label="Kup Przepustkę" label_selected="Kup Przepustkę" name="Buy Pass..." tool_tip="Przepustka udostępnia tymczasowy wstęp na działkę."/>
+			<button label="Kup Przepustkę" name="Buy Pass..." tool_tip="Przepustka udostępnia tymczasowy wstęp na działkę."/>
 			<button label="Porzuć działkę" name="Abandon Land..."/>
 			<button label="Odzyskaj działkę" name="Reclaim Land..."/>
 		</panel>
@@ -165,24 +156,15 @@
 			<text name="covenant_timestamp_text">
 				Ostatnia modyfikacja Wed Dec 31 16:00:00 1969
 			</text>
-			<text name="region_section_lbl">
-				Region:
-			</text>
 			<text name="region_name_text">
 				Wczytywanie...
 			</text>
 			<text name="region_landtype_lbl">
 				Typ:
 			</text>
-			<text name="region_landtype_text">
-				Mainland / Homestead
-			</text>
 			<text name="region_maturity_lbl">
 				Rodzaj:
 			</text>
-			<text name="region_maturity_text">
-				Adult
-			</text>
 			<text name="resellable_lbl">
 				Odsprzedaj:
 			</text>
@@ -208,7 +190,7 @@
 				Ilość ekstra obiektów:
 			</text>
 			<text name="Simulator primitive usage:">
-				Ilość używanych primów:
+				Pojemność regionu:
 			</text>
 			<text name="objects_available">
 				[COUNT] z [MAX] ([AVAILABLE] jest dostępnych)
@@ -248,7 +230,7 @@
 			<name_list name="owner list">
 				<name_list.columns label="Typ" name="type"/>
 				<name_list.columns label="Nazwa" name="name"/>
-				<name_list.columns label="Liczba" name="count"/>
+				<name_list.columns label="Ilość" name="count"/>
 				<name_list.columns label="Najnowsze" name="mostrecent"/>
 			</name_list>
 		</panel>
@@ -273,7 +255,7 @@ Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
 				Twoja działka bądź treść jaką zawiera klasyfikowana jest jako Moderate.
 			</panel.string>
 			<panel.string name="mature_check_adult_tooltip">
-				Informacje o Twojej działce i treści jaką zawiera klasyfikowane są jako Adult.
+				Twoja działka bądź treść jaką zawiera klasyfikowana jest jako Adult.
 			</panel.string>
 			<panel.string name="landing_point_none">
 				(brak)
@@ -361,7 +343,7 @@ Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
 				<combo_box.item label="Gdziekolwiek" name="Anywhere"/>
 			</combo_box>
 		</panel>
-		<panel label="Media" name="land_media_panel">
+		<panel name="land_media_panel">
 			<text name="with media:">
 				Typ mediów:
 			</text>
@@ -394,7 +376,7 @@ teksturę:
 			<text name="Options:">
 				Opcje:
 			</text>
-			<check_box label="Powtarzaj odtwarzanie" name="media_loop" tool_tip="Powtarzaj odtwarzanie mediów w pętli. Po wyświetleniu materiału odtwarzanie rozpocznie się od początku."/>
+			<check_box label="Odtwarzaj w pętli" name="media_loop" tool_tip="Powtarzaj odtwarzanie mediów w pętli. Po wyświetleniu materiału odtwarzanie rozpocznie się od początku."/>
 		</panel>
 		<panel label="Dźwięk" name="land_audio_panel">
 			<text name="MusicURL:">
@@ -430,8 +412,8 @@ teksturę:
 			<text name="Only Allow">
 				Umożliwiaj dostęp tylko dla:
 			</text>
-			<check_box label="Rezydentów zarejestrowanych w systemie płatniczym Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Zbanuj Rezydentów niezarejestrowanych w systemie płatniczym Linden Lab."/>
-			<check_box label="Rezydentów, którzy mają 18+ lat [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Zbanuj Rezydetów, którzy mają mniej niż 18 lat. Odwiedź [SUPPORT_SITE] po więcej informacji."/>
+			<check_box label="Rezydentów zarejestrowanych w systemie płatniczym Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Zbanuj Rezydentów niezarejestrowanych w systemie płatniczym Linden Lab. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji."/>
+			<check_box label="Rezydentów, którzy mają 18+ lat [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Zbanuj Rezydetów, którzy mają mniej niż 18 lat. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji."/>
 			<check_box label="Udostępnij wejście grupie [GROUP]" name="GroupCheck" tool_tip="Ustaw Grupę w głównej zakładce."/>
 			<check_box label="Sprzedaj przepustki:" name="PassCheck" tool_tip="Otwórz tymczasowy dostęp do tej działki"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/vintage/xui/pl/floater_about_land.xml b/indra/newview/skins/vintage/xui/pl/floater_about_land.xml
index 9e75c71ca4..fe33c56d1b 100644
--- a/indra/newview/skins/vintage/xui/pl/floater_about_land.xml
+++ b/indra/newview/skins/vintage/xui/pl/floater_about_land.xml
@@ -7,10 +7,10 @@
 		minuta
 	</floater.string>
 	<floater.string name="Seconds">
-		[SECONDS] sekundy
+		[SECONDS] sekund
 	</floater.string>
 	<floater.string name="Remaining">
-		pozostały
+		pozostało
 	</floater.string>
 	<tab_container name="landtab">
 		<panel label="Ogólne" name="land_general_panel">
@@ -24,7 +24,7 @@
 				Obszar
 			</panel.string>
 			<panel.string name="auction_id_text">
-				Numer aukcji: [ID]
+				ID aukcji: [ID]
 			</panel.string>
 			<panel.string name="need_tier_to_modify">
 				Musisz zaakceptować zakup by móc modyfikować tą działkę.
@@ -50,9 +50,6 @@
 			<panel.string name="no_selection_text">
 				Nie wybrano działki.
 			</panel.string>
-			<panel.string name="time_stamp_template">
-				[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
-			</panel.string>
 			<panel.string name="error_resolving_uuid">
 				Numer identyfikacyjny UUID działki nie został rozpoznany.
 			</panel.string>
@@ -68,15 +65,9 @@
 			<text name="LandType">
 				Typ:
 			</text>
-			<text name="LandTypeText">
-				Mainland / Homestead
-			</text>
 			<text name="ContentRating">
 				Rodzaj:
 			</text>
-			<text name="ContentRatingText">
-				Adult
-			</text>
 			<text name="Owner:">
 				Właściciel:
 			</text>
@@ -97,7 +88,7 @@
 				Na sprzedaż:
 			</text>
 			<text name="Not for sale.">
-				Nie
+				Nie na sprzedaż
 			</text>
 			<text name="For Sale: Price L$[PRICE].">
 				Cena: [PRICE]L$ ([PRICE_PER_SQM]L$/m²).
@@ -129,7 +120,7 @@
 			<button label="Sprzedaż przez Lindenów" name="Linden Sale..." tool_tip="Działka musi mieć Właściciela, zawartość oraz nie może być wystawiona na Aukcję."/>
 			<button label="Skrypty" name="Scripts..."/>
 			<button label="Kup dla Grupy" name="Buy For Group..."/>
-			<button label="Kup Przepustkę" label_selected="Kup Przepustkę" name="Buy Pass..." tool_tip="Przepustka udostępnia tymczasowy wstęp na działkę."/>
+			<button label="Kup Przepustkę" name="Buy Pass..." tool_tip="Przepustka udostępnia tymczasowy wstęp na działkę."/>
 			<button label="Porzuć działkę" name="Abandon Land..."/>
 			<button label="Odzyskaj działkę" name="Reclaim Land..."/>
 		</panel>
@@ -165,24 +156,15 @@
 			<text name="covenant_timestamp_text">
 				Ostatnia modyfikacja Wed Dec 31 16:00:00 1969
 			</text>
-			<text name="region_section_lbl">
-				Region:
-			</text>
 			<text name="region_name_text">
 				Wczytywanie...
 			</text>
 			<text name="region_landtype_lbl">
 				Typ:
 			</text>
-			<text name="region_landtype_text">
-				Mainland / Homestead
-			</text>
 			<text name="region_maturity_lbl">
 				Rodzaj:
 			</text>
-			<text name="region_maturity_text">
-				Adult
-			</text>
 			<text name="resellable_lbl">
 				Odsprzedaj:
 			</text>
@@ -208,7 +190,7 @@
 				Ilość ekstra obiektów:
 			</text>
 			<text name="Simulator primitive usage:">
-				Ilość używanych primów:
+				Pojemność regionu:
 			</text>
 			<text name="objects_available">
 				[COUNT] z [MAX] ([AVAILABLE] jest dostępnych)
@@ -248,7 +230,7 @@
 			<name_list name="owner list">
 				<name_list.columns label="Typ" name="type"/>
 				<name_list.columns label="Nazwa" name="name"/>
-				<name_list.columns label="Liczba" name="count"/>
+				<name_list.columns label="Ilość" name="count"/>
 				<name_list.columns label="Najnowsze" name="mostrecent"/>
 			</name_list>
 		</panel>
@@ -273,7 +255,7 @@ Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
 				Twoja działka bądź treść jaką zawiera klasyfikowana jest jako Moderate.
 			</panel.string>
 			<panel.string name="mature_check_adult_tooltip">
-				Informacje o Twojej działce i treści jaką zawiera klasyfikowane są jako Adult.
+				Twoja działka bądź treść jaką zawiera klasyfikowana jest jako Adult.
 			</panel.string>
 			<panel.string name="landing_point_none">
 				(brak)
@@ -361,7 +343,7 @@ Jedynie większe działki mogą być umieszczone w bazie wyszukiwarki.
 				<combo_box.item label="Gdziekolwiek" name="Anywhere"/>
 			</combo_box>
 		</panel>
-		<panel label="Media" name="land_media_panel">
+		<panel name="land_media_panel">
 			<text name="with media:">
 				Typ mediów:
 			</text>
@@ -394,7 +376,7 @@ teksturę:
 			<text name="Options:">
 				Opcje:
 			</text>
-			<check_box label="Powtarzaj odtwarzanie" name="media_loop" tool_tip="Powtarzaj odtwarzanie mediów w pętli. Po wyświetleniu materiału odtwarzanie rozpocznie się od początku."/>
+			<check_box label="Odtwarzaj w pętli" name="media_loop" tool_tip="Powtarzaj odtwarzanie mediów w pętli. Po wyświetleniu materiału odtwarzanie rozpocznie się od początku."/>
 		</panel>
 		<panel label="Dźwięk" name="land_audio_panel">
 			<text name="MusicURL:">
@@ -430,8 +412,8 @@ teksturę:
 			<text name="Only Allow">
 				Umożliwiaj dostęp tylko dla:
 			</text>
-			<check_box label="Rezydentów zarejestrowanych w systemie płatniczym Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Zbanuj Rezydentów niezarejestrowanych w systemie płatniczym Linden Lab."/>
-			<check_box label="Rezydentów, którzy mają 18+ lat [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Zbanuj Rezydetów, którzy mają mniej niż 18 lat. Odwiedź [SUPPORT_SITE] po więcej informacji."/>
+			<check_box label="Rezydentów zarejestrowanych w systemie płatniczym Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Zbanuj Rezydentów niezarejestrowanych w systemie płatniczym Linden Lab. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji."/>
+			<check_box label="Rezydentów, którzy mają 18+ lat [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Zbanuj Rezydetów, którzy mają mniej niż 18 lat. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji."/>
 			<check_box label="Udostępnij wejście grupie [GROUP]" name="GroupCheck" tool_tip="Ustaw Grupę w głównej zakładce."/>
 			<check_box label="Sprzedaj przepustki:" name="PassCheck" tool_tip="Otwórz tymczasowy dostęp do tej działki"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/vintage/xui/pl/sidepanel_inventory.xml b/indra/newview/skins/vintage/xui/pl/sidepanel_inventory.xml
index 89ff8a4777..8e7338a99c 100644
--- a/indra/newview/skins/vintage/xui/pl/sidepanel_inventory.xml
+++ b/indra/newview/skins/vintage/xui/pl/sidepanel_inventory.xml
@@ -7,13 +7,17 @@
 				<layout_stack name="inbox_outbox_layout_stack_off">
 					<layout_panel name="inbox_layout_panel_off">
 						<panel name="marketplace_inbox">
-							<string name="InboxLabelWithArg">Odebrane przedmioty ([NUM])</string>
-							<string name="InboxLabelNoArg">Odebrane przedmioty</string>
+							<string name="InboxLabelWithArg">
+								Odebrane przedmioty ([NUM])
+							</string>
+							<string name="InboxLabelNoArg">
+								Odebrane przedmioty
+							</string>
 							<text value="Odebrane przedmioty" name="inbox_label" />
 							<text name="inbox_fresh_new_count">
 								[NUM] nowe/y
 							</text>
-							<panel name="inbox_inventory_placeholder_panel" tool_tip="Przeciągnij przedmioty do swojej Szafy, aby je używać">
+							<panel name="inbox_inventory_placeholder_panel" tool_tip="Przeciągnij przedmioty do swojej Szafy, aby ich używać">
 								<panel name="inbox_inventory_placeholder">
 									Rzeczy kupione na Marketplace będą tu dostarczane.
 								</panel>

From 00f386d275e746de3959819ec6f7f90cf2ec5e1d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 7 Nov 2014 09:57:11 +0100
Subject: [PATCH 074/229] FIRE-14618: Provide radian-based functions for
 internal calculator (append "r" to the according function name)

---
 indra/llmath/llcalcparser.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/indra/llmath/llcalcparser.h b/indra/llmath/llcalcparser.h
index 742f6abbd4..07c600c45b 100755
--- a/indra/llmath/llcalcparser.h
+++ b/indra/llmath/llcalcparser.h
@@ -89,6 +89,14 @@ struct LLCalcParser : grammar<LLCalcParser>
 				 (str_p("ASIN") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_asin)(self,arg1)]) |
 				 (str_p("ACOS") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_acos)(self,arg1)]) |
 				 (str_p("ATAN") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_atan)(self,arg1)]) |
+				 // <FS:Ansariel> FIRE-14618: Provide radian-based functions
+				 (str_p("SINR") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_sinr)(self,arg1)]) |
+				 (str_p("COSR") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_cosr)(self,arg1)]) |
+				 (str_p("TANR") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_tanr)(self,arg1)]) |
+				 (str_p("ASINR") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_asinr)(self,arg1)]) |
+				 (str_p("ACOSR") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_acosr)(self,arg1)]) |
+				 (str_p("ATANR") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_atanr)(self,arg1)]) |
+				 // </FS:Ansariel>
 				 (str_p("SQRT") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_sqrt)(self,arg1)]) |
 				 (str_p("LOG") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_log)(self,arg1)]) |
 				 (str_p("EXP") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_exp)(self,arg1)]) |
@@ -172,6 +180,14 @@ private:
 	F32 _asin(const F32& a) const { return asin(a * RAD_TO_DEG); }
 	F32 _acos(const F32& a) const { return acos(a * RAD_TO_DEG); }
 	F32 _atan(const F32& a) const { return atan(a * RAD_TO_DEG); }
+	// <FS:Ansariel> FIRE-14618: Provide radian-based functions
+	F32 _sinr(const F32& a) const { return sin(a); }
+	F32 _cosr(const F32& a) const { return cos(a); }
+	F32 _tanr(const F32& a) const { return tan(a); }
+	F32 _asinr(const F32& a) const { return asin(a); }
+	F32 _acosr(const F32& a) const { return acos(a); }
+	F32 _atanr(const F32& a) const { return atan(a); }
+	// </FS:Ansariel>
 	F32 _sqrt(const F32& a) const { return sqrt(a); }
 	F32 _log(const F32& a) const { return log(a); }
 	F32 _exp(const F32& a) const { return exp(a); }

From eba631c29029e25a2eb3c5f092a24cbec0708c7a Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 7 Nov 2014 10:08:35 +0100
Subject: [PATCH 075/229] Math 101: Maybe it would be a good idea to apply the
 conversion for inverse trigonometric functions after calculating the
 radians...

---
 indra/llmath/llcalcparser.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/llmath/llcalcparser.h b/indra/llmath/llcalcparser.h
index 07c600c45b..7bb2384938 100755
--- a/indra/llmath/llcalcparser.h
+++ b/indra/llmath/llcalcparser.h
@@ -177,9 +177,9 @@ private:
 	F32 _sin(const F32& a) const { return sin(DEG_TO_RAD * a); }
 	F32 _cos(const F32& a) const { return cos(DEG_TO_RAD * a); }
 	F32 _tan(const F32& a) const { return tan(DEG_TO_RAD * a); }
-	F32 _asin(const F32& a) const { return asin(a * RAD_TO_DEG); }
-	F32 _acos(const F32& a) const { return acos(a * RAD_TO_DEG); }
-	F32 _atan(const F32& a) const { return atan(a * RAD_TO_DEG); }
+	F32 _asin(const F32& a) const { return asin(a) * RAD_TO_DEG; }
+	F32 _acos(const F32& a) const { return acos(a) * RAD_TO_DEG; }
+	F32 _atan(const F32& a) const { return atan(a) * RAD_TO_DEG; }
 	// <FS:Ansariel> FIRE-14618: Provide radian-based functions
 	F32 _sinr(const F32& a) const { return sin(a); }
 	F32 _cosr(const F32& a) const { return cos(a); }

From 61203f89c5fab7ad9909706b7e93c77422a6f661 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 7 Nov 2014 14:39:52 +0100
Subject: [PATCH 076/229] Make changes to LanguageIsPublic instant instead of
 requiring a relog

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

diff --git a/indra/newview/llagentlanguage.cpp b/indra/newview/llagentlanguage.cpp
index 16af26eb5b..d96e63e559 100755
--- a/indra/newview/llagentlanguage.cpp
+++ b/indra/newview/llagentlanguage.cpp
@@ -40,6 +40,7 @@ void LLAgentLanguage::init()
 	gSavedSettings.getControl("InstallLanguage")->getSignal()->connect(boost::bind(&onChange));
 	gSavedSettings.getControl("SystemLanguage")->getSignal()->connect(boost::bind(&onChange));
 	gSavedSettings.getControl("LanguageIsPublic")->getSignal()->connect(boost::bind(&onChange));
+	gSavedSettings.getControl("LanguageIsPublic")->getSignal()->connect(boost::bind(&update)); // <FS:Ansariel> Make change instant
 }
 
 // static

From 1c145bc1fbfbe3af87f30f3d9c2a2538e2145c8f Mon Sep 17 00:00:00 2001
From: Jessica <none@none>
Date: Thu, 6 Nov 2014 20:55:03 -0500
Subject: [PATCH 077/229] Group Ban Merge

---
 indra/llui/lltooltip.cpp                      |   6 +-
 indra/newview/CMakeLists.txt                  |   7 +
 indra/newview/llfloatergroupbulkban.cpp       | 134 +++
 indra/newview/llfloatergroupbulkban.h         |  48 +
 indra/newview/llfloaterimcontainer.cpp        |  20 +
 indra/newview/llgroupactions.cpp              |   5 +-
 indra/newview/llgroupmgr.cpp                  | 184 +++-
 indra/newview/llgroupmgr.h                    |  89 +-
 indra/newview/llnamelistctrl.cpp              |  37 +-
 indra/newview/llnamelistctrl.h                |  13 +-
 indra/newview/llpanelgroupbulk.cpp            | 421 +++++++++
 indra/newview/llpanelgroupbulk.h              |  74 ++
 indra/newview/llpanelgroupbulkban.cpp         | 259 ++++++
 indra/newview/llpanelgroupbulkban.h           |  49 +
 indra/newview/llpanelgroupbulkimpl.h          |  99 ++
 indra/newview/llpanelgroupinvite.cpp          |   6 +-
 indra/newview/llpanelgrouproles.cpp           | 844 +++++++++++++-----
 indra/newview/llpanelgrouproles.h             |  65 +-
 indra/newview/llpanelplaceprofile.cpp         |   5 +-
 indra/newview/lltoastnotifypanel.cpp          |   1 +
 indra/newview/llviewerregion.cpp              |   1 +
 indra/newview/roles_constants.h               | 102 +--
 .../skins/default/xui/en/floater_about.xml    |   2 +-
 .../default/xui/en/menu_conversation.xml      |   1 +
 .../skins/default/xui/en/notifications.xml    |  52 +-
 .../default/xui/en/panel_group_bulk_ban.xml   | 108 +++
 .../default/xui/en/panel_group_invite.xml     |   4 +-
 .../default/xui/en/panel_group_roles.xml      | 114 ++-
 .../skins/default/xui/en/role_actions.xml     |   5 +-
 .../newview/skins/default/xui/en/strings.xml  |   1 +
 30 files changed, 2408 insertions(+), 348 deletions(-)
 create mode 100644 indra/newview/llfloatergroupbulkban.cpp
 create mode 100644 indra/newview/llfloatergroupbulkban.h
 create mode 100644 indra/newview/llpanelgroupbulk.cpp
 create mode 100644 indra/newview/llpanelgroupbulk.h
 create mode 100644 indra/newview/llpanelgroupbulkban.cpp
 create mode 100644 indra/newview/llpanelgroupbulkban.h
 create mode 100644 indra/newview/llpanelgroupbulkimpl.h
 create mode 100644 indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml

diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp
index 5e1f12996e..bb7f615d51 100755
--- a/indra/llui/lltooltip.cpp
+++ b/indra/llui/lltooltip.cpp
@@ -476,9 +476,9 @@ void LLToolTipMgr::show(const std::string& msg)
 
 void LLToolTipMgr::show(const LLToolTip::Params& params)
 {
-	if (!params.styled_message.isProvided() 
-		&& (!params.message.isProvided() || params.message().empty())) return;
-
+	if (!params.styled_message.isProvided()
+		&& (!params.message.isProvided() || params.message().empty())
+		&& !params.image.isProvided()) return;
 	// fill in default tooltip params from tool_tip.xml
 	LLToolTip::Params params_with_defaults(params);
 	params_with_defaults.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLToolTip>());
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 9271ef6f74..02859310c6 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -342,6 +342,7 @@ set(viewer_SOURCE_FILES
     llfloatergesture.cpp
     llfloatergodtools.cpp
     llfloatergotoline.cpp
+    llfloatergroupbulkban.cpp
     llfloatergroupinvite.cpp
     llfloatergroups.cpp
     llfloaterhandler.cpp
@@ -515,6 +516,8 @@ set(viewer_SOURCE_FILES
     llpanelface.cpp
     llpanelgenerictip.cpp
     llpanelgroup.cpp
+    llpanelgroupbulk.cpp
+    llpanelgroupbulkban.cpp
     llpanelgroupgeneral.cpp
     llpanelgroupinvite.cpp
     llpanelgrouplandmoney.cpp
@@ -1058,6 +1061,7 @@ set(viewer_HEADER_FILES
     llfloatergesture.h
     llfloatergodtools.h
     llfloatergotoline.h
+    llfloatergroupbulkban.h
     llfloatergroupinvite.h
     llfloatergroups.h
     llfloaterhandler.h
@@ -1224,6 +1228,9 @@ set(viewer_HEADER_FILES
     llpanelface.h
     llpanelgenerictip.h
     llpanelgroup.h
+    llpanelgroupbulk.h
+    llpanelgroupbulkimpl.h
+    llpanelgroupbulkban.h
     llpanelgroupgeneral.h
     llpanelgroupinvite.h
     llpanelgrouplandmoney.h
diff --git a/indra/newview/llfloatergroupbulkban.cpp b/indra/newview/llfloatergroupbulkban.cpp
new file mode 100644
index 0000000000..54a2283b13
--- /dev/null
+++ b/indra/newview/llfloatergroupbulkban.cpp
@@ -0,0 +1,134 @@
+/** 
+* @file llfloatergroupbulkban.cpp
+* @brief Floater to ban Residents from a group.
+* 
+* $LicenseInfo:firstyear=2013&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2013, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloatergroupbulkban.h"
+#include "llpanelgroupbulkban.h"
+#include "lltrans.h"
+#include "lldraghandle.h"
+
+
+class LLFloaterGroupBulkBan::impl
+{
+public:
+	impl(const LLUUID& group_id) : mGroupID(group_id), mBulkBanPanelp(NULL) {}
+	~impl() {}
+
+	static void closeFloater(void* data);
+
+public:
+	LLUUID mGroupID;
+	LLPanelGroupBulkBan* mBulkBanPanelp;
+
+	static std::map<LLUUID, LLFloaterGroupBulkBan*> sInstances;
+};
+
+//
+// Globals
+//
+std::map<LLUUID, LLFloaterGroupBulkBan*> LLFloaterGroupBulkBan::impl::sInstances;
+
+void LLFloaterGroupBulkBan::impl::closeFloater(void* data)
+{
+	LLFloaterGroupBulkBan* floaterp = (LLFloaterGroupBulkBan*)data;
+	if(floaterp)
+		floaterp->closeFloater();
+}
+
+//-----------------------------------------------------------------------------
+// Implementation
+//-----------------------------------------------------------------------------
+LLFloaterGroupBulkBan::LLFloaterGroupBulkBan(const LLUUID& group_id/*=LLUUID::null*/)
+	: LLFloater(group_id)
+{
+	S32 floater_header_size = getHeaderHeight();
+	LLRect contents;
+
+	mImpl = new impl(group_id);
+	mImpl->mBulkBanPanelp = new LLPanelGroupBulkBan(group_id);
+
+	contents = mImpl->mBulkBanPanelp->getRect();
+	contents.mTop -= floater_header_size;
+
+	setTitle(mImpl->mBulkBanPanelp->getString("GroupBulkBan"));
+	mImpl->mBulkBanPanelp->setCloseCallback(impl::closeFloater, this);
+	mImpl->mBulkBanPanelp->setRect(contents);
+
+	addChild(mImpl->mBulkBanPanelp);
+}
+
+LLFloaterGroupBulkBan::~LLFloaterGroupBulkBan()
+{
+	if(mImpl->mGroupID.notNull())
+	{
+		impl::sInstances.erase(mImpl->mGroupID);
+	}
+
+	delete mImpl->mBulkBanPanelp;
+	delete mImpl;
+}
+
+void LLFloaterGroupBulkBan::showForGroup(const LLUUID& group_id, uuid_vec_t* agent_ids)
+{
+	const LLFloater::Params& floater_params = LLFloater::getDefaultParams();
+	S32 floater_header_size = floater_params.header_height;
+	LLRect contents;
+
+	// Make sure group_id isn't null
+	if (group_id.isNull())
+	{
+		llwarns << "LLFloaterGroupInvite::showForGroup with null group_id!" << llendl;
+		return;
+	}
+
+	// If we don't have a floater for this group, create one.
+	LLFloaterGroupBulkBan* fgb = get_if_there(impl::sInstances,
+		group_id,
+		(LLFloaterGroupBulkBan*)NULL);
+	if (!fgb)
+	{
+		fgb = new LLFloaterGroupBulkBan(group_id);
+		contents = fgb->mImpl->mBulkBanPanelp->getRect();
+		contents.mTop += floater_header_size;
+		fgb->setRect(contents);
+		fgb->getDragHandle()->setRect(contents);
+		fgb->getDragHandle()->setTitle(fgb->mImpl->mBulkBanPanelp->getString("GroupBulkBan"));
+
+		impl::sInstances[group_id] = fgb;
+
+		fgb->mImpl->mBulkBanPanelp->clear();
+	}
+
+	if (agent_ids != NULL)
+	{
+		fgb->mImpl->mBulkBanPanelp->addUsers(*agent_ids);
+	}
+
+	fgb->center();
+	fgb->openFloater();
+	fgb->mImpl->mBulkBanPanelp->update();
+}
diff --git a/indra/newview/llfloatergroupbulkban.h b/indra/newview/llfloatergroupbulkban.h
new file mode 100644
index 0000000000..5b680a1ba4
--- /dev/null
+++ b/indra/newview/llfloatergroupbulkban.h
@@ -0,0 +1,48 @@
+/** 
+* @file   llfloatergroupbulkban.h
+* @brief  This floater is a wrapper for LLPanelGroupBulkBan, which
+* is used to ban Residents from a specific group.
+*
+* $LicenseInfo:firstyear=2013&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2013, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+#ifndef LL_LLFLOATERGROUPBULKBAN_H
+#define LL_LLFLOATERGROUPBULKBAN_H
+
+#include "llfloater.h"
+#include "lluuid.h"
+
+class LLFloaterGroupBulkBan : public LLFloater
+{
+public:
+	virtual ~LLFloaterGroupBulkBan();
+
+	static void showForGroup(const LLUUID& group_id, uuid_vec_t* agent_ids = NULL);
+
+protected:
+	LLFloaterGroupBulkBan(const LLUUID& group_id = LLUUID::null);
+
+	class impl;
+	impl* mImpl;
+};
+
+#endif // LL_LLFLOATERGROUPBULKBAN_H
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index eaf557d278..339d15f26e 100755
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1272,6 +1272,22 @@ bool LLFloaterIMContainer::enableContextMenuItem(const LLSD& userdata)
 	uuid_vec_t uuids;
 	getParticipantUUIDs(uuids);
 
+
+	//If there is group or ad-hoc chat in multiselection, everything needs to be disabled
+	if(uuids.size() > 1)
+	{
+		const std::set<LLFolderViewItem*> selectedItems = mConversationsRoot->getSelectionList();
+		LLConversationItem * conversationItem;
+		for(std::set<LLFolderViewItem*>::const_iterator it = selectedItems.begin(); it != selectedItems.end(); ++it)
+		{
+			conversationItem = static_cast<LLConversationItem *>((*it)->getViewModelItem());
+			if((conversationItem->getType() == LLConversationItem::CONV_SESSION_GROUP) || (conversationItem->getType() == LLConversationItem::CONV_SESSION_AD_HOC))
+			{
+				return false;
+			}
+		}
+	}
+
 	if ("conversation_log" == item)
 	{
 		return gSavedPerAccountSettings.getS32("KeepConversationLogTranscripts") > 0;
@@ -1376,6 +1392,10 @@ bool LLFloaterIMContainer::enableContextMenuItem(const std::string& item, uuid_v
     else if ("can_call" == item)
     {
         return LLAvatarActions::canCall();
+    }
+    else if ("can_open_voice_conversation" == item)
+    {
+    	return is_single_select && LLAvatarActions::canCall();
     }
 	else if ("can_zoom_in" == item)
 	{
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index af7c630ee7..10a55dbc41 100755
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -173,7 +173,7 @@ public:
 
 	void changed(LLGroupChange gc)
 	{
-		if (gc == GC_MEMBER_DATA && !mRequestProcessed)
+		if (gc == GC_PROPERTIES && !mRequestProcessed)
 		{
 			LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupId);
 			if (!gdatap)
@@ -183,9 +183,6 @@ public:
 			else if (!gdatap->isMemberDataComplete())
 			{
 				LL_WARNS() << "LLGroupMgr::getInstance()->getGroupData()->isMemberDataComplete() was FALSE" << LL_ENDL;
-			}
-			else
-			{
 				processGroupData();
 				mRequestProcessed = true;
 			}
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index c7def870d4..58a069ab16 100755
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -238,11 +238,11 @@ LLGroupMgrGroupData::LLGroupMgrGroupData(const LLUUID& id) :
 	mMemberCount(0),
 	mRoleCount(0),
 	mReceivedRoleMemberPairs(0),
-	mMemberDataComplete(FALSE),
-	mRoleDataComplete(FALSE),
-	mRoleMemberDataComplete(FALSE),
-	mGroupPropertiesDataComplete(FALSE),
-	mPendingRoleMemberRequest(FALSE),
+	mMemberDataComplete(false),
+	mRoleDataComplete(false),
+	mRoleMemberDataComplete(false),
+	mGroupPropertiesDataComplete(false),
+	mPendingRoleMemberRequest(false),
 	mAccessTime(0.0f)
 {
 	mMemberVersion.generate();
@@ -431,7 +431,7 @@ void LLGroupMgrGroupData::removeMemberData()
 		delete mi->second;
 	}
 	mMembers.clear();
-	mMemberDataComplete = FALSE;
+	mMemberDataComplete = false;
 	mMemberVersion.generate();
 }
 
@@ -453,8 +453,8 @@ void LLGroupMgrGroupData::removeRoleData()
 	}
 	mRoles.clear();
 	mReceivedRoleMemberPairs = 0;
-	mRoleDataComplete = FALSE;
-	mRoleMemberDataComplete = FALSE;
+	mRoleDataComplete = false;
+	mRoleMemberDataComplete= false;
 }
 
 void LLGroupMgrGroupData::removeRoleMemberData()
@@ -478,7 +478,7 @@ void LLGroupMgrGroupData::removeRoleMemberData()
 	}
 
 	mReceivedRoleMemberPairs = 0;
-	mRoleMemberDataComplete = FALSE;
+	mRoleMemberDataComplete= false;
 }
 
 LLGroupMgrGroupData::~LLGroupMgrGroupData()
@@ -754,6 +754,20 @@ void LLGroupMgrGroupData::cancelRoleChanges()
 	// Clear out all changes!
 	mRoleChanges.clear();
 }
+
+void LLGroupMgrGroupData::createBanEntry(const LLUUID& ban_id, const LLGroupBanData& ban_data)
+{ 
+	mBanList[ban_id] = ban_data;
+}
+
+void LLGroupMgrGroupData::removeBanEntry(const LLUUID& ban_id)
+{
+	mBanList.erase(ban_id);
+}
+
+
+
+
 //
 // LLGroupMgr
 //
@@ -963,12 +977,12 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
 
 	if (group_datap->mMembers.size() ==  (U32)group_datap->mMemberCount)
 	{
-		group_datap->mMemberDataComplete = TRUE;
+		group_datap->mMemberDataComplete = true;
 		group_datap->mMemberRequestID.setNull();
 		// We don't want to make role-member data requests until we have all the members
 		if (group_datap->mPendingRoleMemberRequest)
 		{
-			group_datap->mPendingRoleMemberRequest = FALSE;
+			group_datap->mPendingRoleMemberRequest = false;
 			LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(group_datap->mID);
 		}
 	}
@@ -1038,7 +1052,7 @@ void LLGroupMgr::processGroupPropertiesReply(LLMessageSystem* msg, void** data)
 	group_datap->mMemberCount = num_group_members;
 	group_datap->mRoleCount = num_group_roles + 1; // Add the everyone role.
 	
-	group_datap->mGroupPropertiesDataComplete = TRUE;
+	group_datap->mGroupPropertiesDataComplete = true;
 	group_datap->mChanged = TRUE;
 
 	LLGroupMgr::getInstance()->notifyObservers(GC_PROPERTIES);
@@ -1115,12 +1129,12 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data)
 
 	if (group_datap->mRoles.size() == (U32)group_datap->mRoleCount)
 	{
-		group_datap->mRoleDataComplete = TRUE;
+		group_datap->mRoleDataComplete = true;
 		group_datap->mRoleDataRequestID.setNull();
 		// We don't want to make role-member data requests until we have all the role data
 		if (group_datap->mPendingRoleMemberRequest)
 		{
-			group_datap->mPendingRoleMemberRequest = FALSE;
+			group_datap->mPendingRoleMemberRequest = false;
 			LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(group_datap->mID);
 		}
 	}
@@ -1229,7 +1243,7 @@ void LLGroupMgr::processGroupRoleMembersReply(LLMessageSystem* msg, void** data)
 			}
 		}
 		
-        group_datap->mRoleMemberDataComplete = TRUE;
+        group_datap->mRoleMemberDataComplete= true;
 		group_datap->mRoleMembersRequestID.setNull();
 	}
 
@@ -1555,7 +1569,7 @@ void LLGroupMgr::sendGroupRoleMembersRequest(const LLUUID& group_id)
 			LL_INFOS() << " Pending: " << (group_datap->mPendingRoleMemberRequest ? "Y" : "N")
 				<< " MemberDataComplete: " << (group_datap->mMemberDataComplete ? "Y" : "N")
 				<< " RoleDataComplete: " << (group_datap->mRoleDataComplete ? "Y" : "N") << LL_ENDL;
-			group_datap->mPendingRoleMemberRequest = TRUE;
+			group_datap->mPendingRoleMemberRequest = true;
 			return;
 		}
 
@@ -1873,6 +1887,138 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
 }
 
 
+// Responder class for capability group management
+class GroupBanDataResponder : public LLHTTPClient::Responder
+{
+public:
+	GroupBanDataResponder(const LLUUID& gropup_id, BOOL force_refresh=false);
+	virtual ~GroupBanDataResponder() {}
+	virtual void result(const LLSD& pContent);
+	virtual void errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent);
+private:
+	LLUUID mGroupID;
+	BOOL mForceRefresh;
+};
+
+GroupBanDataResponder::GroupBanDataResponder(const LLUUID& gropup_id, BOOL force_refresh) :
+	mGroupID(gropup_id),
+	mForceRefresh(force_refresh)
+{}
+
+void GroupBanDataResponder::errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent)
+{
+	LL_WARNS("GrpMgr") << "Error receiving group member data [status:" 
+		<< pStatus << "]: " << pContent << LL_ENDL;
+}
+
+void GroupBanDataResponder::result(const LLSD& content)
+{
+	if (content.has("ban_list"))
+	{
+		// group ban data received
+		LLGroupMgr::processGroupBanRequest(content);
+	}
+	else if (mForceRefresh)
+	{
+		// no ban data received, refreshing data after successful operation 
+		LLGroupMgr::getInstance()->sendGroupBanRequest(LLGroupMgr::REQUEST_GET, mGroupID);
+	}
+}
+
+void LLGroupMgr::sendGroupBanRequest(	EBanRequestType request_type, 
+										const LLUUID& group_id, 
+										U32 ban_action, /* = BAN_NO_ACTION */
+										const std::vector<LLUUID> ban_list) /* = std::vector<LLUUID>() */
+{
+	LLViewerRegion* currentRegion = gAgent.getRegion();
+	if(!currentRegion)
+	{
+		LL_WARNS("GrpMgr") << "Agent does not have a current region." << LL_ENDL;
+		return;
+	}
+
+	// Check to make sure we have our capabilities
+	if(!currentRegion->capabilitiesReceived())
+	{
+		LL_WARNS("GrpMgr") << " Capabilities not received!" << LL_ENDL;
+		return;
+	}
+
+	// Get our capability
+	std::string cap_url =  currentRegion->getCapability("GroupAPIv1");
+	if(cap_url.empty())
+	{
+		return;
+	}
+	cap_url += "?group_id=" + group_id.asString();
+
+	LLSD body = LLSD::emptyMap();
+	body["ban_action"]  = (LLSD::Integer)(ban_action & ~BAN_UPDATE);
+	// Add our list of potential banned agents to the list
+	body["ban_ids"]	= LLSD::emptyArray();
+	LLSD ban_entry;
+
+	uuid_vec_t::const_iterator iter = ban_list.begin();
+	for(;iter != ban_list.end(); ++iter)
+	{
+		ban_entry = (*iter);
+		body["ban_ids"].append(ban_entry);
+	}
+
+	LLHTTPClient::ResponderPtr grp_ban_responder = new GroupBanDataResponder(group_id, ban_action & BAN_UPDATE);
+	switch(request_type)
+	{
+	case REQUEST_GET:
+		LLHTTPClient::get(cap_url, grp_ban_responder);
+		break;
+	case REQUEST_POST:
+		LLHTTPClient::post(cap_url, body, grp_ban_responder);
+		break;
+	case REQUEST_PUT:
+	case REQUEST_DEL:
+		break;
+	}
+}
+
+
+void LLGroupMgr::processGroupBanRequest(const LLSD& content)
+{
+	// Did we get anything in content?
+	if(!content.size())
+	{
+		LL_WARNS("GrpMgr") << "No group member data received." << LL_ENDL;
+		return;
+	}
+
+	LLUUID group_id = content["group_id"].asUUID();
+	
+	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(group_id);
+	if (!gdatap)
+		return;
+	
+	LLSD::map_const_iterator i		= content["ban_list"].beginMap();
+	LLSD::map_const_iterator iEnd	= content["ban_list"].endMap();
+	for(;i != iEnd; ++i)
+	{
+		const LLUUID ban_id(i->first);
+		LLSD ban_entry(i->second);
+		
+		LLGroupBanData ban_data;
+		if(ban_entry.has("ban_date"))
+		{
+			ban_data.mBanDate = ban_entry["ban_date"].asDate();
+			// TODO: Ban Reason
+		}
+
+		gdatap->createBanEntry(ban_id, ban_data);
+	}
+
+	gdatap->mChanged = TRUE;
+	LLGroupMgr::getInstance()->notifyObservers(GC_BANLIST);
+}
+
+
+
 // Responder class for capability group management
 class GroupMemberDataResponder : public LLHTTPClient::Responder
 {
@@ -1958,7 +2104,7 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
 	if(num_members < 1)
 		return;
 	
-	LLUUID	group_id = content["group_id"].asUUID();
+	LLUUID group_id = content["group_id"].asUUID();
 
 	LLGroupMgrGroupData* group_datap = LLGroupMgr::getInstance()->getGroupData(group_id);
 	if(!group_datap)
@@ -2041,12 +2187,12 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
 		LLGroupMgr::getInstance()->sendGroupTitlesRequest(group_id);
 
 
-	group_datap->mMemberDataComplete = TRUE;
+	group_datap->mMemberDataComplete = true;
 	group_datap->mMemberRequestID.setNull();
 	// Make the role-member data request
 	if (group_datap->mPendingRoleMemberRequest)
 	{
-		group_datap->mPendingRoleMemberRequest = FALSE;
+		group_datap->mPendingRoleMemberRequest = false;
 		LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(group_id);
 	}
 
diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h
index ece6a8cdbb..44a666ef0a 100755
--- a/indra/newview/llgroupmgr.h
+++ b/indra/newview/llgroupmgr.h
@@ -33,8 +33,10 @@
 #include <string>
 #include <map>
 
+// Forward Declarations
 class LLMessageSystem;
-
+class LLGroupRoleData;
+class LLGroupMgr;
 
 enum LLGroupChange
 {
@@ -43,9 +45,12 @@ enum LLGroupChange
 	GC_ROLE_DATA,
 	GC_ROLE_MEMBER_DATA,
 	GC_TITLES,
+	GC_BANLIST,
 	GC_ALL
 };
 
+const U32 GB_MAX_BANNED_AGENTS = 500;
+
 class LLGroupMgrObserver
 {
 public:
@@ -65,8 +70,6 @@ public:
 	virtual void changed(const LLUUID& group_id, LLGroupChange gc) = 0;
 };
 
-class LLGroupRoleData;
-
 class LLGroupMemberData
 {
 friend class LLGroupMgrGroupData;
@@ -205,6 +208,17 @@ struct lluuid_pair_less
 	}
 };
 
+
+struct LLGroupBanData
+{
+	LLGroupBanData(): mBanDate()	{}
+	~LLGroupBanData()	{}
+	
+	LLDate mBanDate;
+	// TODO: std:string ban_reason;
+};
+
+
 struct LLGroupTitle
 {
 	std::string mTitle;
@@ -212,8 +226,6 @@ struct LLGroupTitle
 	BOOL		mSelected;
 };
 
-class LLGroupMgr;
-
 class LLGroupMgrGroupData
 {
 friend class LLGroupMgr;
@@ -244,16 +256,16 @@ public:
 	void recalcAgentPowers(const LLUUID& agent_id);
 
 // [SL:KB] - Patch: Chat-GroupSessionEject | Checked: 2012-02-04 (Catznip-3.2.1) | Added: Catznip-3.2.1
-	BOOL isMemberDataComplete() const { return mMemberDataComplete; }
-	BOOL isRoleDataComplete() const { return mRoleDataComplete; }
-	BOOL isRoleMemberDataComplete() const { return mRoleMemberDataComplete; }
-	BOOL isGroupPropertiesDataComplete() const { return mGroupPropertiesDataComplete; }
+	bool isMemberDataComplete() const { return mMemberDataComplete; }
+	bool isRoleDataComplete() const { return mRoleDataComplete; }
+	bool isRoleMemberDataComplete() const { return mRoleMemberDataComplete; }
+	bool isGroupPropertiesDataComplete() const { return mGroupPropertiesDataComplete; }
 // [/SL:KB]
-//	BOOL isMemberDataComplete() { return mMemberDataComplete; }
-//	BOOL isRoleDataComplete() { return mRoleDataComplete; }
-//	BOOL isRoleMemberDataComplete() { return mRoleMemberDataComplete; }
-//	BOOL isGroupPropertiesDataComplete() { return mGroupPropertiesDataComplete; }
-	
+//	bool isMemberDataComplete() { return mMemberDataComplete; }
+//	bool isRoleDataComplete() { return mRoleDataComplete; }
+//	bool isRoleMemberDataComplete() { return mRoleMemberDataComplete; }
+//	bool isGroupPropertiesDataComplete() { return mGroupPropertiesDataComplete; }
+
 	bool isSingleMemberNotOwner();
 
 	F32 getAccessTime() const { return mAccessTime; }
@@ -261,17 +273,26 @@ public:
 
 	const LLUUID& getMemberVersion() const { return mMemberVersion; }
 
+	void clearBanList() { mBanList.clear(); }
+	void getBanList(const LLUUID& group_id, LLGroupBanData& ban_data);
+	const LLGroupBanData& getBanEntry(const LLUUID& ban_id) { return mBanList[ban_id]; }
+	
+	void createBanEntry(const LLUUID& ban_id, const LLGroupBanData& ban_data = LLGroupBanData());
+	void removeBanEntry(const LLUUID& ban_id);
+	
+
 public:
 	typedef	std::map<LLUUID,LLGroupMemberData*> member_list_t;
 	typedef	std::map<LLUUID,LLGroupRoleData*> role_list_t;
 	typedef std::map<lluuid_pair,LLRoleMemberChange,lluuid_pair_less> change_map_t;
 	typedef std::map<LLUUID,LLRoleData> role_data_map_t;
+	typedef std::map<LLUUID,LLGroupBanData> ban_list_t;
+
 	member_list_t		mMembers;
 	role_list_t			mRoles;
-
-	
 	change_map_t		mRoleMemberChanges;
 	role_data_map_t		mRoleChanges;
+	ban_list_t			mBanList;
 
 	std::vector<LLGroupTitle> mTitles;
 
@@ -302,12 +323,12 @@ private:
 	LLUUID				mTitlesRequestID;
 	U32					mReceivedRoleMemberPairs;
 
-	BOOL				mMemberDataComplete;
-	BOOL				mRoleDataComplete;
-	BOOL				mRoleMemberDataComplete;
-	BOOL				mGroupPropertiesDataComplete;
+	bool				mMemberDataComplete;
+	bool				mRoleDataComplete;
+	bool				mRoleMemberDataComplete;
+	bool				mGroupPropertiesDataComplete;
 
-	BOOL				mPendingRoleMemberRequest;
+	bool				mPendingRoleMemberRequest;
 	F32					mAccessTime;
 
 	// Generate a new ID every time mMembers
@@ -334,6 +355,23 @@ class LLGroupMgr : public LLSingleton<LLGroupMgr>
 {
 	LOG_CLASS(LLGroupMgr);
 	
+public:
+	enum EBanRequestType
+	{
+		REQUEST_GET = 0,
+		REQUEST_POST,
+		REQUEST_PUT,
+		REQUEST_DEL
+	};
+
+	enum EBanRequestAction
+	{
+		BAN_NO_ACTION	= 0,
+		BAN_CREATE		= 1,
+		BAN_DELETE		= 2,
+		BAN_UPDATE		= 4
+	};
+
 public:
 	LLGroupMgr();
 	~LLGroupMgr();
@@ -367,8 +405,14 @@ public:
 	static void sendGroupMemberInvites(const LLUUID& group_id, std::map<LLUUID,LLUUID>& role_member_pairs);
 	static void sendGroupMemberEjects(const LLUUID& group_id,
 									  uuid_vec_t& member_ids);
+	
+	static void sendGroupBanRequest(EBanRequestType request_type, 
+									const LLUUID& group_id,	
+									U32 ban_action = BAN_NO_ACTION,
+									const uuid_vec_t ban_list = uuid_vec_t());
+
+	static void processGroupBanRequest(const LLSD& content);
 
-	// BAKER
 	void sendCapGroupMembersRequest(const LLUUID& group_id);
 	static void processCapGroupMembersRequest(const LLSD& content);
 
@@ -413,4 +457,3 @@ private:
 
 
 #endif
-
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index f1a1f70270..29d5440fa1 100755
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -64,11 +64,8 @@ LLNameListCtrl::LLNameListCtrl(const LLNameListCtrl::Params& p)
 	mNameColumnIndex(p.name_column.column_index),
 	mNameColumn(p.name_column.column_name),
 	mAllowCallingCardDrop(p.allow_calling_card_drop),
-	// <FS:Ansariel> FIRE-12347 / MAINT-3187: Name list not loading
-	//mShortNames(p.short_names),
-	mShortNames(p.short_names)
-	//mAvatarNameCacheConnection()
-	// </FS:Ansariel>
+	mShortNames(p.short_names),
+	mPendingLookupsRemaining(0)
 {}
 
 // public
@@ -357,6 +354,17 @@ LLScrollListItem* LLNameListCtrl::addNameItemRow(
 				}
 				mAvatarNameCacheConnections[id] = LLAvatarNameCache::get(id,boost::bind(&LLNameListCtrl::onAvatarNameCache,this, _1, _2, suffix, item->getHandle()));
 				// </FS:Ansariel>
+
+				if(mPendingLookupsRemaining <= 0)
+				{
+					// BAKER TODO:
+					// We might get into a state where mPendingLookupsRemaining might
+					//	go negative.  So just reset it right now and figure out if it's
+					//	possible later :)
+					mPendingLookupsRemaining = 0;
+					mNameListCompleteSignal(false);
+				}
+				mPendingLookupsRemaining++;
 			}
 			break;
 		}
@@ -408,6 +416,8 @@ void LLNameListCtrl::removeNameItem(const LLUUID& agent_id)
 	{
 		selectNthItem(idx); // not sure whether this is needed, taken from previous implementation
 		deleteSingleItem(idx);
+
+		mPendingLookupsRemaining--;
 	}
 }
 
@@ -456,6 +466,23 @@ void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id,
 		}
 	}
 	
+	//////////////////////////////////////////////////////////////////////////
+	// BAKER - FIX NameListCtrl
+ 	//if (mPendingLookupsRemaining <= 0)
+ 	{
+ 		// We might get into a state where mPendingLookupsRemaining might
+ 		//	go negative.  So just reset it right now and figure out if it's
+ 		//	possible later :)
+ 		//mPendingLookupsRemaining = 0;
+		
+ 		mNameListCompleteSignal(true);
+ 	}
+ 	//else
+ 	{
+ 	//	mPendingLookupsRemaining--;
+ 	}
+	//////////////////////////////////////////////////////////////////////////
+
 	dirtyColumns();
 }
 
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index aeeb5e9b86..c332f2b967 100755
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -70,6 +70,7 @@ class LLNameListCtrl
 :	public LLScrollListCtrl, public LLInstanceTracker<LLNameListCtrl>
 {
 public:
+	typedef boost::signals2::signal<void(bool)> namelist_complete_signal_t;
 
 	typedef enum e_name_type
 	{
@@ -165,7 +166,7 @@ public:
 
 	/*virtual*/ void updateColumns(bool force_update);
 
-	/*virtual*/ void	mouseOverHighlightNthItem( S32 index );
+	/*virtual*/ void mouseOverHighlightNthItem( S32 index );
 private:
 	void showInspector(const LLUUID& avatar_id, bool is_group);
 	// <FS:Ansariel> FIRE-12347 / MAINT-3187: Name list not loading
@@ -183,6 +184,16 @@ private:
 	typedef boost::unordered_map<LLUUID, boost::signals2::connection, FSUUIDHash> avatar_name_cache_connection_map_t;
 	avatar_name_cache_connection_map_t mAvatarNameCacheConnections;
 	// </FS:Ansariel>
+
+	S32 mPendingLookupsRemaining;
+	namelist_complete_signal_t mNameListCompleteSignal;
+	
+public:
+	boost::signals2::connection setOnNameListCompleteCallback(boost::function<void(bool)> onNameListCompleteCallback) 
+	{ 
+		return mNameListCompleteSignal.connect(onNameListCompleteCallback); 
+	}
+
 };
 
 
diff --git a/indra/newview/llpanelgroupbulk.cpp b/indra/newview/llpanelgroupbulk.cpp
new file mode 100644
index 0000000000..1eafc5bd64
--- /dev/null
+++ b/indra/newview/llpanelgroupbulk.cpp
@@ -0,0 +1,421 @@
+/** 
+* @file llpanelgroupbulk.cpp
+* @brief Implementation of llpanelgroupbulk
+* @author Baker@lindenlab.com
+*
+* $LicenseInfo:firstyear=2013&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2013, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpanelgroupbulk.h"
+#include "llpanelgroupbulkimpl.h"
+
+#include "llagent.h"
+#include "llavatarnamecache.h"
+#include "llfloateravatarpicker.h"
+#include "llbutton.h"
+#include "llcallingcard.h"
+#include "llcombobox.h"
+#include "llgroupactions.h"
+#include "llgroupmgr.h"
+#include "llnamelistctrl.h"
+#include "llnotificationsutil.h"
+#include "llscrolllistitem.h"
+#include "llspinctrl.h"
+#include "lltextbox.h"
+#include "llviewerobject.h"
+#include "llviewerobjectlist.h"
+#include "lluictrlfactory.h"
+#include "llviewerwindow.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+// Implementation of llpanelgroupbulkimpl.h functions
+//////////////////////////////////////////////////////////////////////////
+LLPanelGroupBulkImpl::LLPanelGroupBulkImpl(const LLUUID& group_id) :
+	mGroupID(group_id),
+	mBulkAgentList(NULL),
+	mOKButton(NULL),
+	mRemoveButton(NULL),
+	mGroupName(NULL),
+	mLoadingText(),
+	mTooManySelected(),
+	mCloseCallback(NULL),
+	mCloseCallbackUserData(NULL),
+	mAvatarNameCacheConnection(),
+	mRoleNames(NULL),
+	mOwnerWarning(),
+	mAlreadyInGroup(),
+	mConfirmedOwnerInvite(false),
+	mListFullNotificationSent(false)
+{}
+
+LLPanelGroupBulkImpl::~LLPanelGroupBulkImpl()
+{
+	if(mAvatarNameCacheConnection.connected())
+	{
+		mAvatarNameCacheConnection.disconnect();
+	}
+}
+
+void LLPanelGroupBulkImpl::callbackClickAdd(void* userdata)
+{
+	LLPanelGroupBulk* panelp = (LLPanelGroupBulk*)userdata;
+
+	if(panelp)
+	{
+		//Right now this is hard coded with some knowledge that it is part
+		//of a floater since the avatar picker needs to be added as a dependent
+		//floater to the parent floater.
+		//Soon the avatar picker will be embedded into this panel
+		//instead of being it's own separate floater.  But that is next week.
+		//This will do for now. -jwolk May 10, 2006
+		LLView* button = panelp->findChild<LLButton>("add_button");
+		LLFloater* root_floater = gFloaterView->getParentFloater(panelp);
+		LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(
+			boost::bind(callbackAddUsers, _1, panelp->mImplementation), TRUE, FALSE, FALSE, root_floater->getName(), button);
+		if(picker)
+		{
+			root_floater->addDependentFloater(picker);
+		}
+	}
+}
+
+void LLPanelGroupBulkImpl::callbackClickRemove(void* userdata)
+{
+	LLPanelGroupBulkImpl* selfp = (LLPanelGroupBulkImpl*)userdata;
+	if (selfp) 
+		selfp->handleRemove();
+}
+
+void LLPanelGroupBulkImpl::callbackClickCancel(void* userdata)
+{
+	LLPanelGroupBulkImpl* selfp = (LLPanelGroupBulkImpl*)userdata;
+	if(selfp) 
+		(*(selfp->mCloseCallback))(selfp->mCloseCallbackUserData);
+}
+
+void LLPanelGroupBulkImpl::callbackSelect(LLUICtrl* ctrl, void* userdata)
+{
+	LLPanelGroupBulkImpl* selfp = (LLPanelGroupBulkImpl*)userdata;
+	if (selfp) 
+		selfp->handleSelection();
+}
+
+void LLPanelGroupBulkImpl::callbackAddUsers(const uuid_vec_t& agent_ids, void* user_data)
+{
+	std::vector<std::string> names;
+	for (S32 i = 0; i < (S32)agent_ids.size(); i++)
+	{
+		LLAvatarName av_name;
+		if (LLAvatarNameCache::get(agent_ids[i], &av_name))
+		{
+			onAvatarNameCache(agent_ids[i], av_name, user_data);
+		}
+		else 
+		{
+			LLPanelGroupBulkImpl* selfp = (LLPanelGroupBulkImpl*) user_data;
+			if (selfp)
+			{
+				if (selfp->mAvatarNameCacheConnection.connected())
+				{
+					selfp->mAvatarNameCacheConnection.disconnect();
+				}
+				// *TODO : Add a callback per avatar name being fetched.
+				selfp->mAvatarNameCacheConnection = LLAvatarNameCache::get(agent_ids[i],boost::bind(onAvatarNameCache, _1, _2, user_data));
+			}
+		}
+	}
+}
+
+void LLPanelGroupBulkImpl::onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, void* user_data)
+{
+	LLPanelGroupBulkImpl* selfp = (LLPanelGroupBulkImpl*) user_data;
+
+	if (selfp)
+	{
+		if (selfp->mAvatarNameCacheConnection.connected())
+		{
+			selfp->mAvatarNameCacheConnection.disconnect();
+		}
+		std::vector<std::string> names;
+		uuid_vec_t agent_ids;
+		agent_ids.push_back(agent_id);
+		names.push_back(av_name.getCompleteName());
+
+		selfp->addUsers(names, agent_ids);
+	}
+}
+
+void LLPanelGroupBulkImpl::handleRemove()
+{
+	std::vector<LLScrollListItem*> selection = mBulkAgentList->getAllSelected();
+	if (selection.empty()) 
+		return;
+
+	std::vector<LLScrollListItem*>::iterator iter;
+	for(iter = selection.begin(); iter != selection.end(); ++iter)
+	{
+		mInviteeIDs.erase((*iter)->getUUID());
+	}
+
+	mBulkAgentList->deleteSelectedItems();
+	mRemoveButton->setEnabled(FALSE);
+
+	if(	mOKButton && mOKButton->getEnabled() &&
+		mBulkAgentList->isEmpty())
+	{
+		mOKButton->setEnabled(FALSE);
+	}
+}
+
+void LLPanelGroupBulkImpl::handleSelection()
+{
+	std::vector<LLScrollListItem*> selection = mBulkAgentList->getAllSelected();
+	if (selection.empty())
+		mRemoveButton->setEnabled(FALSE);
+	else
+		mRemoveButton->setEnabled(TRUE);
+}
+
+void LLPanelGroupBulkImpl::addUsers(const std::vector<std::string>& names, const uuid_vec_t& agent_ids)
+{
+	std::string name;
+	LLUUID id;
+
+	if(mListFullNotificationSent)
+	{	
+		return;
+	}
+
+	if(	!mListFullNotificationSent &&
+		(names.size() + mInviteeIDs.size() > MAX_GROUP_INVITES))
+	{
+		mListFullNotificationSent = true;
+
+		// Fail! Show a warning and don't add any names.
+		LLSD msg;
+		msg["MESSAGE"] = mTooManySelected;
+		LLNotificationsUtil::add("GenericAlert", msg);
+		return;
+	}
+
+	for (S32 i = 0; i < (S32)names.size(); ++i)
+	{
+		name = names[i];
+		id = agent_ids[i];
+
+		if(mInviteeIDs.find(id) != mInviteeIDs.end())
+		{
+			continue;
+		}
+
+		//add the name to the names list
+		LLSD row;
+		row["id"] = id;
+		row["columns"][0]["value"] = name;
+
+		mBulkAgentList->addElement(row);
+		mInviteeIDs.insert(id);
+
+		// We've successfully added someone to the list.
+		if(mOKButton && !mOKButton->getEnabled())
+			mOKButton->setEnabled(TRUE);
+	}
+}
+
+void LLPanelGroupBulkImpl::setGroupName(std::string name)
+{
+	if(mGroupName)
+		mGroupName->setText(name);
+}
+
+
+LLPanelGroupBulk::LLPanelGroupBulk(const LLUUID& group_id) : 
+	LLPanel(),
+	mImplementation(new LLPanelGroupBulkImpl(group_id)),
+	mPendingGroupPropertiesUpdate(false),
+	mPendingRoleDataUpdate(false),
+	mPendingMemberDataUpdate(false)
+{}
+
+LLPanelGroupBulk::~LLPanelGroupBulk()
+{
+	delete mImplementation;
+}
+
+void LLPanelGroupBulk::clear()
+{
+	mImplementation->mInviteeIDs.clear();
+
+	if(mImplementation->mBulkAgentList)
+		mImplementation->mBulkAgentList->deleteAllItems();
+	
+	if(mImplementation->mOKButton)
+		mImplementation->mOKButton->setEnabled(FALSE);
+}
+
+void LLPanelGroupBulk::update()
+{
+	updateGroupName();
+	updateGroupData();
+}
+
+void LLPanelGroupBulk::draw()
+{
+	LLPanel::draw();
+	update();
+}
+
+void LLPanelGroupBulk::updateGroupName()
+{
+	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mImplementation->mGroupID);
+
+	if(	gdatap &&
+		gdatap->isGroupPropertiesDataComplete())
+	{
+		// Only do work if the current group name differs
+		if(mImplementation->mGroupName->getText().compare(gdatap->mName) != 0)
+			mImplementation->setGroupName(gdatap->mName);
+	}
+	else
+	{
+		mImplementation->setGroupName(mImplementation->mLoadingText);
+	}
+}
+
+void LLPanelGroupBulk::updateGroupData()
+{
+	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mImplementation->mGroupID);
+	if(gdatap && gdatap->isGroupPropertiesDataComplete())
+	{
+		mPendingGroupPropertiesUpdate = false;
+	}
+	else
+	{
+		if(!mPendingGroupPropertiesUpdate)
+		{
+			mPendingGroupPropertiesUpdate = true;
+			LLGroupMgr::getInstance()->sendGroupPropertiesRequest(mImplementation->mGroupID);
+		}
+	}
+
+	if(gdatap && gdatap->isRoleDataComplete())
+	{
+		mPendingRoleDataUpdate = false;
+	}
+	else
+	{
+		if(!mPendingRoleDataUpdate)
+		{
+			mPendingRoleDataUpdate = true;
+			LLGroupMgr::getInstance()->sendGroupRoleDataRequest(mImplementation->mGroupID);
+		}
+	}
+
+	if(gdatap && gdatap->isMemberDataComplete())
+	{
+		mPendingMemberDataUpdate = false;
+	}
+	else
+	{
+		if(!mPendingMemberDataUpdate)
+		{
+			mPendingMemberDataUpdate = true;
+			LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mImplementation->mGroupID);
+		}
+	}
+}
+
+void LLPanelGroupBulk::addUserCallback(const LLUUID& id, const LLAvatarName& av_name)
+{
+	std::vector<std::string> names;
+	uuid_vec_t agent_ids;
+	agent_ids.push_back(id);
+	names.push_back(av_name.getAccountName());
+
+	mImplementation->addUsers(names, agent_ids);
+}
+
+void LLPanelGroupBulk::setCloseCallback(void (*close_callback)(void*), void* data)
+{
+	mImplementation->mCloseCallback         = close_callback;
+	mImplementation->mCloseCallbackUserData = data;
+}
+
+void LLPanelGroupBulk::addUsers(uuid_vec_t& agent_ids)
+{
+	std::vector<std::string> names;
+	for (S32 i = 0; i < (S32)agent_ids.size(); i++)
+	{
+		std::string fullname;
+		LLUUID agent_id = agent_ids[i];
+		LLViewerObject* dest = gObjectList.findObject(agent_id);
+		if(dest && dest->isAvatar())
+		{
+			LLNameValue* nvfirst = dest->getNVPair("FirstName");
+			LLNameValue* nvlast = dest->getNVPair("LastName");
+			if(nvfirst && nvlast)
+			{
+				fullname = LLCacheName::buildFullName(
+					nvfirst->getString(), nvlast->getString());
+
+			}
+			if (!fullname.empty())
+			{
+				names.push_back(fullname);
+			} 
+			else 
+			{
+				llwarns << "llPanelGroupBulk: Selected avatar has no name: " << dest->getID() << llendl;
+				names.push_back("(Unknown)");
+			}
+		}
+		else
+		{
+			//looks like user try to invite offline friend
+			//for offline avatar_id gObjectList.findObject() will return null
+			//so we need to do this additional search in avatar tracker, see EXT-4732
+			if (LLAvatarTracker::instance().isBuddy(agent_id))
+			{
+				LLAvatarName av_name;
+				if (!LLAvatarNameCache::get(agent_id, &av_name))
+				{
+					// actually it should happen, just in case
+					LLAvatarNameCache::get(LLUUID(agent_id), boost::bind(&LLPanelGroupBulk::addUserCallback, this, _1, _2));
+					// for this special case!
+					//when there is no cached name we should remove resident from agent_ids list to avoid breaking of sequence
+					// removed id will be added in callback
+					agent_ids.erase(agent_ids.begin() + i);
+				}
+				else
+				{
+					names.push_back(av_name.getAccountName());
+				}
+			}
+		}
+	}
+	mImplementation->mListFullNotificationSent = false;
+	mImplementation->addUsers(names, agent_ids);
+}
+
diff --git a/indra/newview/llpanelgroupbulk.h b/indra/newview/llpanelgroupbulk.h
new file mode 100644
index 0000000000..222931eabc
--- /dev/null
+++ b/indra/newview/llpanelgroupbulk.h
@@ -0,0 +1,74 @@
+/** 
+* @file   llpanelgroupbulk.h
+* @brief  Header file for llpanelgroupbulk
+* @author Baker@lindenlab.com
+*
+* $LicenseInfo:firstyear=2013&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2013, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLPANELGROUPBULK_H
+#define LL_LLPANELGROUPBULK_H
+
+#include "llpanel.h"
+#include "lluuid.h"
+
+class LLAvatarName;
+class LLGroupMgrGroupData;
+class LLPanelGroupBulkImpl;
+
+// Base panel class for bulk group invite / ban floaters
+class LLPanelGroupBulk : public LLPanel
+{
+public:
+	LLPanelGroupBulk(const LLUUID& group_id);
+	~LLPanelGroupBulk();
+
+public:	
+	static void callbackClickSubmit(void* userdata) {}
+	virtual void submit() = 0;
+
+public:
+	virtual void clear();
+	virtual void update();
+	virtual void draw();
+
+protected:
+	virtual void updateGroupName();
+	virtual void updateGroupData();
+
+public:
+	// this callback is being used to add a user whose fullname isn't been loaded before invoking of addUsers().
+	virtual void addUserCallback(const LLUUID& id, const LLAvatarName& av_name);
+	virtual void setCloseCallback(void (*close_callback)(void*), void* data);
+
+	virtual void addUsers(uuid_vec_t& agent_ids);
+
+public:
+	LLPanelGroupBulkImpl* mImplementation;
+
+protected:
+	bool mPendingGroupPropertiesUpdate;
+	bool mPendingRoleDataUpdate;
+	bool mPendingMemberDataUpdate;
+};
+
+#endif // LL_LLPANELGROUPBULK_H
+
diff --git a/indra/newview/llpanelgroupbulkban.cpp b/indra/newview/llpanelgroupbulkban.cpp
new file mode 100644
index 0000000000..cf1f0bc32f
--- /dev/null
+++ b/indra/newview/llpanelgroupbulkban.cpp
@@ -0,0 +1,259 @@
+/** 
+* @file llpanelgroupbulkban.cpp
+*
+* $LicenseInfo:firstyear=2013&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2013, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpanelgroupbulkban.h"
+#include "llpanelgroupbulk.h"
+#include "llpanelgroupbulkimpl.h"
+
+#include "llagent.h"
+#include "llavatarnamecache.h"
+#include "llavataractions.h"
+#include "llfloateravatarpicker.h"
+#include "llbutton.h"
+#include "llcallingcard.h"
+#include "llcombobox.h"
+#include "llgroupactions.h"
+#include "llgroupmgr.h"
+#include "llnamelistctrl.h"
+#include "llnotificationsutil.h"
+#include "llscrolllistitem.h"
+#include "llslurl.h"
+#include "llspinctrl.h"
+#include "lltextbox.h"
+#include "llviewerobject.h"
+#include "llviewerobjectlist.h"
+#include "lluictrlfactory.h"
+#include "llviewerwindow.h"
+
+#include <boost/foreach.hpp>
+
+LLPanelGroupBulkBan::LLPanelGroupBulkBan(const LLUUID& group_id) : LLPanelGroupBulk(group_id)
+{
+	// Pass on construction of this panel to the control factory.
+	buildFromFile( "panel_group_bulk_ban.xml");
+}
+
+BOOL LLPanelGroupBulkBan::postBuild()
+{
+	BOOL recurse = TRUE;
+
+	mImplementation->mLoadingText = getString("loading");
+	mImplementation->mGroupName = getChild<LLTextBox>("group_name_text", recurse);
+	mImplementation->mBulkAgentList = getChild<LLNameListCtrl>("banned_agent_list", recurse);
+	if ( mImplementation->mBulkAgentList )
+	{
+		mImplementation->mBulkAgentList->setCommitOnSelectionChange(TRUE);
+		mImplementation->mBulkAgentList->setCommitCallback(LLPanelGroupBulkImpl::callbackSelect, mImplementation);
+	}
+
+	LLButton* button = getChild<LLButton>("add_button", recurse);
+	if ( button )
+	{
+		// default to opening avatarpicker automatically
+		// (*impl::callbackClickAdd)((void*)this);
+		button->setClickedCallback(LLPanelGroupBulkImpl::callbackClickAdd, this);
+	}
+
+	mImplementation->mRemoveButton = 
+		getChild<LLButton>("remove_button", recurse);
+	if ( mImplementation->mRemoveButton )
+	{
+		mImplementation->mRemoveButton->setClickedCallback(LLPanelGroupBulkImpl::callbackClickRemove, mImplementation);
+		mImplementation->mRemoveButton->setEnabled(FALSE);
+	}
+
+	mImplementation->mOKButton = 
+		getChild<LLButton>("ban_button", recurse);
+	if ( mImplementation->mOKButton )
+	{
+		mImplementation->mOKButton->setClickedCallback(LLPanelGroupBulkBan::callbackClickSubmit, this);
+		mImplementation->mOKButton->setEnabled(FALSE);
+	}
+
+	button = getChild<LLButton>("cancel_button", recurse);
+	if ( button )
+	{
+		button->setClickedCallback(LLPanelGroupBulkImpl::callbackClickCancel, mImplementation);
+	}
+
+	mImplementation->mTooManySelected = getString("ban_selection_too_large");
+	mImplementation->mBanNotPermitted = getString("ban_not_permitted");
+	mImplementation->mBanLimitFail = getString("ban_limit_fail");
+	mImplementation->mCannotBanYourself = getString("cant_ban_yourself");
+
+	update();
+	return TRUE;
+}
+
+// TODO: Refactor the shitty callback functions with void* -- just use boost::bind to call submit() instead.
+void LLPanelGroupBulkBan::callbackClickSubmit(void* userdata)
+{
+	LLPanelGroupBulkBan* selfp = (LLPanelGroupBulkBan*)userdata;
+
+	if(selfp)
+		selfp->submit();
+}
+
+
+void LLPanelGroupBulkBan::submit()
+{
+	if (!gAgent.hasPowerInGroup(mImplementation->mGroupID, GP_GROUP_BAN_ACCESS))
+	{
+		// Fail! Agent no longer have ban rights. Permissions could have changed after button was pressed.
+		LLSD msg;
+		msg["MESSAGE"] = mImplementation->mBanNotPermitted;
+		LLNotificationsUtil::add("GenericAlert", msg);
+		(*(mImplementation->mCloseCallback))(mImplementation->mCloseCallbackUserData);
+		return;
+	}
+	LLGroupMgrGroupData * group_datap = LLGroupMgr::getInstance()->getGroupData(mImplementation->mGroupID);
+	if (group_datap && group_datap->mBanList.size() >= GB_MAX_BANNED_AGENTS)
+	{
+		// Fail! Size limit exceeded. List could have updated after button was pressed.
+		LLSD msg;
+		msg["MESSAGE"] = mImplementation->mBanLimitFail;
+		LLNotificationsUtil::add("GenericAlert", msg);
+		(*(mImplementation->mCloseCallback))(mImplementation->mCloseCallbackUserData);
+		return;
+	}
+	std::vector<LLUUID> banned_agent_list;	
+	std::vector<LLScrollListItem*> agents = mImplementation->mBulkAgentList->getAllData();
+	std::vector<LLScrollListItem*>::iterator iter = agents.begin();
+	for(;iter != agents.end(); ++iter)
+	{
+		LLScrollListItem* agent = *iter;
+		banned_agent_list.push_back(agent->getUUID());
+	}
+
+	const S32 MAX_BANS_PER_REQUEST = 100; // Max bans per request. 100 to match server cap.
+	if (banned_agent_list.size() > MAX_BANS_PER_REQUEST)
+	{
+		// Fail!
+		LLSD msg;
+		msg["MESSAGE"] = mImplementation->mTooManySelected;
+		LLNotificationsUtil::add("GenericAlert", msg);
+		(*(mImplementation->mCloseCallback))(mImplementation->mCloseCallbackUserData);
+		return;
+	}
+
+	// remove already banned users and yourself from request.
+	std::vector<LLAvatarName> banned_avatar_names;
+	std::vector<LLAvatarName> out_of_limit_names;
+	bool banning_self = FALSE;
+	std::vector<LLUUID>::iterator conflict = std::find(banned_agent_list.begin(), banned_agent_list.end(), gAgent.getID());
+	if (conflict != banned_agent_list.end())
+	{
+		banned_agent_list.erase(conflict);
+		banning_self = TRUE;
+	}
+	if (group_datap)
+	{
+		BOOST_FOREACH(const LLGroupMgrGroupData::ban_list_t::value_type& group_ban_pair, group_datap->mBanList)
+		{
+			const LLUUID& group_ban_agent_id = group_ban_pair.first;
+			std::vector<LLUUID>::iterator conflict = std::find(banned_agent_list.begin(), banned_agent_list.end(), group_ban_agent_id);
+			if (conflict != banned_agent_list.end())
+			{
+				LLAvatarName av_name;
+				LLAvatarNameCache::get(group_ban_agent_id, &av_name);
+				banned_avatar_names.push_back(av_name);
+
+				banned_agent_list.erase(conflict);
+				if (banned_agent_list.size() == 0)
+				{
+					break;
+				}
+			}
+		}
+		// this check should always be the last one before we send the request.
+		// Otherwise we have a possibility of cutting more then we need to.
+		if (banned_agent_list.size() > GB_MAX_BANNED_AGENTS - group_datap->mBanList.size())
+		{
+			std::vector<LLUUID>::iterator exeedes_limit = banned_agent_list.begin() + GB_MAX_BANNED_AGENTS - group_datap->mBanList.size();
+			for (std::vector<LLUUID>::iterator itor = exeedes_limit ; 
+				itor != banned_agent_list.end(); ++itor)
+			{
+				LLAvatarName av_name;
+				LLAvatarNameCache::get(*itor, &av_name);
+				out_of_limit_names.push_back(av_name);
+			}
+			banned_agent_list.erase(exeedes_limit,banned_agent_list.end());
+		}
+	}
+
+	// sending request and ejecting members
+	if (banned_agent_list.size() != 0)
+	{
+		LLGroupMgr::getInstance()->sendGroupBanRequest(LLGroupMgr::REQUEST_POST, mImplementation->mGroupID, LLGroupMgr::BAN_CREATE | LLGroupMgr::BAN_UPDATE, banned_agent_list);
+		LLGroupMgr::getInstance()->sendGroupMemberEjects(mImplementation->mGroupID, banned_agent_list);
+	}
+
+	// building notification
+	if (banned_avatar_names.size() > 0 || banning_self || out_of_limit_names.size() > 0)
+	{
+		std::string reasons;
+		if(banned_avatar_names.size() > 0)
+		{
+			reasons = "\n " + buildResidentsArgument(banned_avatar_names, "residents_already_banned");
+		}
+
+		if(banning_self)
+		{
+			reasons += "\n " + mImplementation->mCannotBanYourself;
+		}
+
+		if(out_of_limit_names.size() > 0)
+		{
+			reasons += "\n " + buildResidentsArgument(out_of_limit_names, "ban_limit_reached");
+		}
+
+		LLStringUtil::format_map_t msg_args;
+		msg_args["[REASONS]"] = reasons;
+		LLSD msg;
+		if (banned_agent_list.size() == 0)
+		{
+			msg["MESSAGE"] = getString("ban_failed", msg_args);
+		}
+		else
+		{
+			msg["MESSAGE"] = getString("partial_ban", msg_args);
+		}
+		LLNotificationsUtil::add("GenericAlert", msg);
+	}
+	
+	//then close
+	(*(mImplementation->mCloseCallback))(mImplementation->mCloseCallbackUserData);
+}
+
+std::string LLPanelGroupBulkBan::buildResidentsArgument(std::vector<LLAvatarName> avatar_names, const std::string &format)
+{
+	std::string names_string;
+	LLAvatarActions::buildResidentsString(avatar_names, names_string);
+	LLStringUtil::format_map_t args;
+	args["[RESIDENTS]"] = names_string;
+	return getString(format, args);
+}
diff --git a/indra/newview/llpanelgroupbulkban.h b/indra/newview/llpanelgroupbulkban.h
new file mode 100644
index 0000000000..9060d275f9
--- /dev/null
+++ b/indra/newview/llpanelgroupbulkban.h
@@ -0,0 +1,49 @@
+/** 
+* @file   llpanelgroupbulkban.h
+*
+* $LicenseInfo:firstyear=2013&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2013, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+#ifndef LL_LLPANELGROUPBULKBAN_H
+#define LL_LLPANELGROUPBULKBAN_H
+
+#include "llpanel.h"
+#include "lluuid.h"
+#include "llpanelgroupbulk.h"
+
+class LLAvatarName;
+
+class LLPanelGroupBulkBan : public LLPanelGroupBulk
+{
+public:
+	LLPanelGroupBulkBan(const LLUUID& group_id);
+	~LLPanelGroupBulkBan() {}
+
+	virtual BOOL postBuild();
+
+	static void callbackClickSubmit(void* userdata);
+	virtual void submit();
+private:
+	std::string buildResidentsArgument(std::vector<LLAvatarName> avatar_names, const std::string &format);
+};
+
+#endif // LL_LLPANELGROUPBULKBAN_H
diff --git a/indra/newview/llpanelgroupbulkimpl.h b/indra/newview/llpanelgroupbulkimpl.h
new file mode 100644
index 0000000000..d3a48e5a9a
--- /dev/null
+++ b/indra/newview/llpanelgroupbulkimpl.h
@@ -0,0 +1,99 @@
+/** 
+* @file   llpanelgroupbulkimpl.h
+* @brief  Class definition for implementation class of LLPanelGroupBulk
+* @author Baker@lindenlab.com
+*
+* $LicenseInfo:firstyear=2013&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2013, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLPANELGROUPBULKIMPL_H
+#define LL_LLPANELGROUPBULKIMPL_H
+
+#include "llpanel.h"
+#include "lluuid.h"
+
+class LLAvatarName;
+class LLNameListCtrl;
+class LLTextBox;
+class LLComboBox;
+
+//////////////////////////////////////////////////////////////////////////
+//	Implementation found in llpanelgroupbulk.cpp
+//////////////////////////////////////////////////////////////////////////
+class LLPanelGroupBulkImpl
+{
+public:
+	LLPanelGroupBulkImpl(const LLUUID& group_id);
+	~LLPanelGroupBulkImpl();
+
+	static void callbackClickAdd(void* userdata);
+	static void callbackClickRemove(void* userdata);
+
+	static void callbackClickCancel(void* userdata);
+
+	static void callbackSelect(LLUICtrl* ctrl, void* userdata);
+	static void callbackAddUsers(const uuid_vec_t& agent_ids, void* user_data);
+
+	static void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, void* user_data);
+
+	void handleRemove();
+	void handleSelection();
+
+	void addUsers(const std::vector<std::string>& names, const uuid_vec_t& agent_ids);
+	void setGroupName(std::string name);
+
+
+public:
+	static const S32 MAX_GROUP_INVITES = 100;	// Max invites per request. 100 to match server cap.
+	
+
+	LLUUID				mGroupID;
+
+	LLNameListCtrl*		mBulkAgentList;
+	LLButton*			mOKButton;
+	LLButton*			mRemoveButton;
+	LLTextBox*			mGroupName;
+
+	std::string			mLoadingText; 
+	std::string			mTooManySelected;
+	std::string			mBanNotPermitted;
+	std::string			mBanLimitFail;
+	std::string			mCannotBanYourself;
+
+	std::set<LLUUID>	mInviteeIDs;
+
+	void (*mCloseCallback)(void* data);
+	void* mCloseCallbackUserData;
+	boost::signals2::connection mAvatarNameCacheConnection;
+
+	// The following are for the LLPanelGroupInvite subclass only.  
+	// These aren't needed for LLPanelGroupBulkBan, but if we have to add another 
+	// group bulk floater for some reason, we'll have these objects too.
+public:
+	LLComboBox*		mRoleNames;
+	std::string		mOwnerWarning;
+	std::string		mAlreadyInGroup;
+	bool			mConfirmedOwnerInvite;
+	bool			mListFullNotificationSent;
+};
+
+#endif // LL_LLPANELGROUPBULKIMPL_H
+
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
index cd69a0e3f3..e662a05dfc 100755
--- a/indra/newview/llpanelgroupinvite.cpp
+++ b/indra/newview/llpanelgroupinvite.cpp
@@ -501,9 +501,7 @@ void LLPanelGroupInvite::addUsers(uuid_vec_t& agent_ids)
 			//looks like user try to invite offline friend
 			//for offline avatar_id gObjectList.findObject() will return null
 			//so we need to do this additional search in avatar tracker, see EXT-4732
-			// <FS:Ansariel> FIRE-4140: Group invite button on profile sometimes doesn't work
-			//if (LLAvatarTracker::instance().isBuddy(agent_id))
-			// </FS:Ansariel>
+			if (LLAvatarTracker::instance().isBuddy(agent_id))
 			{
 				LLAvatarName av_name;
 				if (!LLAvatarNameCache::get(agent_id, &av_name))
@@ -657,7 +655,7 @@ BOOL LLPanelGroupInvite::postBuild()
 	}
 
 	mImplementation->mOKButton = 
-		getChild<LLButton>("ok_button", recurse);
+		getChild<LLButton>("invite_button", recurse);
 	if ( mImplementation->mOKButton )
  	{
 		mImplementation->mOKButton->setClickedCallback(impl::callbackClickOK, mImplementation);
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 8410f1a2aa..b3e3b9b535 100755
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llpanelgrouproles.cpp
  * @brief Panel for roles information about a particular group.
  *
@@ -32,6 +32,7 @@
 #include "llavatarnamecache.h"
 #include "llbutton.h"
 #include "llfiltereditor.h"
+#include "llfloatergroupbulkban.h"
 #include "llfloatergroupinvite.h"
 #include "llavataractions.h"
 #include "lliconctrl.h"
@@ -112,8 +113,10 @@ bool agentCanAddToRole(const LLUUID& group_id,
 	return false;
 }
 
-// static
 
+// LLPanelGroupRoles /////////////////////////////////////////////////////
+
+// static
 LLPanelGroupRoles::LLPanelGroupRoles()
 :	LLPanelGroupTab(),
 	mCurrentTab(NULL),
@@ -300,7 +303,6 @@ bool LLPanelGroupRoles::onModalClose(const LLSD& notification, const LLSD& respo
 	return false;
 }
 
-
 bool LLPanelGroupRoles::apply(std::string& mesg)
 {
 	// Pass this along to the currently visible sub tab.
@@ -337,7 +339,6 @@ void LLPanelGroupRoles::update(LLGroupChange gc)
 {
 	if (mGroupID.isNull()) return;
 	
-	
 	LLPanelGroupTab* panelp = (LLPanelGroupTab*) mSubTabContainer->getCurrentPanel();
 	if (panelp)
 	{
@@ -354,39 +355,33 @@ void LLPanelGroupRoles::activate()
 {
 	// Start requesting member and role data if needed.
 	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
-	//if (!gdatap || mFirstUse)
+	if (!gdatap || !gdatap->isMemberDataComplete() )
 	{
-		// Check member data.
-		
-		if (!gdatap || !gdatap->isMemberDataComplete() )
-		{
-			LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mGroupID);
-		}
-
-		// Check role data.
-		if (!gdatap || !gdatap->isRoleDataComplete() )
-		{
-			// Mildly hackish - clear all pending changes
-			cancel();
-
-			LLGroupMgr::getInstance()->sendGroupRoleDataRequest(mGroupID);
-		}
-
-		// Check role-member mapping data.
-		if (!gdatap || !gdatap->isRoleMemberDataComplete() )
-		{
-			LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(mGroupID);
-		}
-
-		// Need this to get base group member powers
-		if (!gdatap || !gdatap->isGroupPropertiesDataComplete() )
-		{
-			LLGroupMgr::getInstance()->sendGroupPropertiesRequest(mGroupID);
-		}
-
-		mFirstUse = FALSE;
+		LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mGroupID);
 	}
 
+	if (!gdatap || !gdatap->isRoleDataComplete() )
+	{
+		// Mildly hackish - clear all pending changes
+		cancel();
+
+		LLGroupMgr::getInstance()->sendGroupRoleDataRequest(mGroupID);
+	}
+
+	// Check role-member mapping data.
+	if (!gdatap || !gdatap->isRoleMemberDataComplete() )
+	{
+		LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(mGroupID);
+	}
+
+	// Need this to get base group member powers
+	if (!gdatap || !gdatap->isGroupPropertiesDataComplete() )
+	{
+		LLGroupMgr::getInstance()->sendGroupPropertiesRequest(mGroupID);
+	}
+
+	mFirstUse = FALSE;
+
 	LLPanelGroupTab* panelp = (LLPanelGroupTab*) mSubTabContainer->getCurrentPanel();
 	if (panelp) panelp->activate();
 }
@@ -415,15 +410,42 @@ BOOL LLPanelGroupRoles::hasModal()
 	return panelp->hasModal();
 }
 
+void LLPanelGroupRoles::setGroupID(const LLUUID& id)
+{
+	LLPanelGroupTab::setGroupID(id);
 
-////////////////////////////
-// LLPanelGroupSubTab
-////////////////////////////
+	LLPanelGroupMembersSubTab* group_members_tab = findChild<LLPanelGroupMembersSubTab>("members_sub_tab");
+	LLPanelGroupRolesSubTab*  group_roles_tab = findChild<LLPanelGroupRolesSubTab>("roles_sub_tab");
+	LLPanelGroupActionsSubTab* group_actions_tab = findChild<LLPanelGroupActionsSubTab>("actions_sub_tab");
+	LLPanelGroupBanListSubTab* group_ban_tab = findChild<LLPanelGroupBanListSubTab>("banlist_sub_tab");
+
+	if(group_members_tab) group_members_tab->setGroupID(id);
+	if(group_roles_tab) group_roles_tab->setGroupID(id);
+	if(group_actions_tab) group_actions_tab->setGroupID(id);
+	if(group_ban_tab) group_ban_tab->setGroupID(id);
+
+	LLButton* button = getChild<LLButton>("member_invite");
+	if ( button )
+		button->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_MEMBER_INVITE));
+	// [FS:CR] FIRE-12276
+	button = getChild<LLButton>("export_list");
+	if (button)
+		button->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_MEMBER_VISIBLE_IN_DIR));
+	// [/FS:CR]
+	if(mSubTabContainer)
+		mSubTabContainer->selectTab(1);
+	group_roles_tab->mFirstOpen = TRUE;
+	activate();
+}
+
+
+// LLPanelGroupSubTab ////////////////////////////////////////////////////
 LLPanelGroupSubTab::LLPanelGroupSubTab()
 :	LLPanelGroupTab(),
 	mHeader(NULL),
 	mFooter(NULL),
 	mActivated(false),
+	mHasGroupBanPower(false),
 	mSearchEditor(NULL)
 {
 }
@@ -545,9 +567,10 @@ void LLPanelGroupSubTab::buildActionsList(LLScrollListCtrl* ctrl,
 		return;
 	}
 
+	mHasGroupBanPower = false;
+
 	std::vector<LLRoleActionSet*>::iterator ras_it = LLGroupMgr::getInstance()->mRoleActionSets.begin();
 	std::vector<LLRoleActionSet*>::iterator ras_end = LLGroupMgr::getInstance()->mRoleActionSets.end();
-
 	for ( ; ras_it != ras_end; ++ras_it)
 	{
 		buildActionCategory(ctrl,
@@ -677,6 +700,31 @@ void LLPanelGroupSubTab::buildActionCategory(LLScrollListCtrl* ctrl,
 			row["columns"][column_index]["value"] = (*ra_it)->mDescription;
 			row["columns"][column_index]["font"] = "SANSSERIF_SMALL";
 
+			if(mHasGroupBanPower)
+			{
+				// The ban ability is being set. Prevent these abilities from being manipulated
+				if((*ra_it)->mPowerBit == GP_MEMBER_EJECT)
+				{
+					row["enabled"] = false;
+				}
+				else if((*ra_it)->mPowerBit == GP_ROLE_REMOVE_MEMBER)
+				{
+					row["enabled"] = false;
+				}
+			}
+			else
+			{
+				// The ban ability is not set. Allow these abilities to be manipulated
+				if((*ra_it)->mPowerBit == GP_MEMBER_EJECT)
+				{
+					row["enabled"] = true;
+				}
+				else if((*ra_it)->mPowerBit == GP_ROLE_REMOVE_MEMBER)
+				{
+					row["enabled"] = true;
+				}
+			}
+
 			LLScrollListItem* item = ctrl->addElement(row, ADD_BOTTOM, (*ra_it));
 
 			if (-1 != check_box_index)
@@ -712,6 +760,15 @@ void LLPanelGroupSubTab::buildActionCategory(LLScrollListCtrl* ctrl,
 						check->setTentative(TRUE);
 					}
 				}
+
+				// Regardless of whether or not this ability is allowed by all or some, we want to prevent
+				// the group managers from accidentally disabling either of the two additional abilities
+				// tied with GP_GROUP_BAN_ACCESS.
+				if(	(allowed_by_all & GP_GROUP_BAN_ACCESS) == GP_GROUP_BAN_ACCESS ||
+					(allowed_by_some & GP_GROUP_BAN_ACCESS) == GP_GROUP_BAN_ACCESS)
+				{
+					mHasGroupBanPower = true;
+				}
 			}
 		}
 
@@ -731,11 +788,8 @@ void LLPanelGroupSubTab::setFooterEnabled(BOOL enable)
 	}
 }
 
-////////////////////////////
-// LLPanelGroupMembersSubTab
-////////////////////////////
-
 
+// LLPanelGroupMembersSubTab /////////////////////////////////////////////
 static LLPanelInjector<LLPanelGroupMembersSubTab> t_panel_group_members_subtab("panel_group_members_subtab");
 
 LLPanelGroupMembersSubTab::LLPanelGroupMembersSubTab()
@@ -834,6 +888,13 @@ BOOL LLPanelGroupMembersSubTab::postBuildSubTab(LLView* root)
 		mEjectBtn->setEnabled(FALSE);
 	}
 
+	mBanBtn = parent->getChild<LLButton>("member_ban", recurse);
+	if(mBanBtn)
+	{
+		mBanBtn->setClickedCallback(onBanMember, this);
+		mBanBtn->setEnabled(FALSE);
+	}
+
 	return TRUE;
 }
 
@@ -847,34 +908,6 @@ void LLPanelGroupMembersSubTab::setGroupID(const LLUUID& id)
 	LLPanelGroupSubTab::setGroupID(id);
 }
 
-void LLPanelGroupRolesSubTab::setGroupID(const LLUUID& id)
-{
-	if(mRolesList) mRolesList->deleteAllItems();
-	if(mAssignedMembersList) mAssignedMembersList->deleteAllItems();
-	if(mAllowedActionsList) mAllowedActionsList->deleteAllItems();
-
-	if(mRoleName) mRoleName->clear();
-	if(mRoleDescription) mRoleDescription->clear();
-	if(mRoleTitle) mRoleTitle->clear();
-
-	mHasRoleChange = FALSE;
-
-	setFooterEnabled(FALSE);
-
-	LLPanelGroupSubTab::setGroupID(id);
-}
-void LLPanelGroupActionsSubTab::setGroupID(const LLUUID& id)
-{
-	if(mActionList) mActionList->deleteAllItems();
-	if(mActionRoles) mActionRoles->deleteAllItems();
-	if(mActionMembers) mActionMembers->deleteAllItems();
-
-	if(mActionDescription) mActionDescription->clear();
-
-	LLPanelGroupSubTab::setGroupID(id);
-}
-
-
 // static
 void LLPanelGroupMembersSubTab::onMemberSelect(LLUICtrl* ctrl, void* user_data)
 {
@@ -903,7 +936,7 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
 
 	// Build a vector of all selected members, and gather allowed actions.
 	uuid_vec_t selected_members;
-	U64 allowed_by_all = 0xffffffffffffLL;
+	U64 allowed_by_all = GP_ALL_POWERS; //0xFFFFffffFFFFffffLL;
 	U64 allowed_by_some = 0;
 
 	std::vector<LLScrollListItem*>::iterator itor;
@@ -940,8 +973,8 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
 	LLGroupMgrGroupData::role_list_t::iterator iter = gdatap->mRoles.begin();
 	LLGroupMgrGroupData::role_list_t::iterator end  = gdatap->mRoles.end();
 
-	BOOL can_eject_members = gAgent.hasPowerInGroup(mGroupID,
-													GP_MEMBER_EJECT);
+	BOOL can_ban_members = gAgent.hasPowerInGroup(mGroupID,	GP_GROUP_BAN_ACCESS);
+	BOOL can_eject_members = gAgent.hasPowerInGroup(mGroupID, GP_MEMBER_EJECT);
 	BOOL member_is_owner = FALSE;
 	
 	for( ; iter != end; ++iter)
@@ -988,6 +1021,7 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
 					{
 						// Can't remove other owners.
 						cb_enable = FALSE;
+						can_ban_members = FALSE;
 						break;
 					}
 				}
@@ -1007,14 +1041,14 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
 			}
 			
 			// If anyone selected is in any role besides 'Everyone' then they can't be ejected.
-			if (role_id.notNull() && (count > 0))
-			{
+ 			if (role_id.notNull() && (count > 0))
+ 			{
 				can_eject_members = FALSE;
-				if (role_id == gdatap->mOwnerRole)
-				{
-					member_is_owner = TRUE;
-				}
-			}
+ 				if (role_id == gdatap->mOwnerRole)
+ 				{
+ 					member_is_owner = TRUE;
+ 				}
+ 			}
 
 			LLRoleData rd;
 			if (gdatap->getRoleData(role_id,rd))
@@ -1071,7 +1105,10 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
 	mAssignedRolesList->setEnabled(TRUE);
 
 	if (gAgent.isGodlike())
+	{
 		can_eject_members = TRUE;
+	//	can_ban_members = TRUE;
+	}
 
 	if (!can_eject_members && !member_is_owner)
 	{
@@ -1084,10 +1121,41 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
 			if ( member_data && member_data->isInRole(gdatap->mOwnerRole) )
 			{
 				can_eject_members = TRUE;
+				//can_ban_members = TRUE;
 			}
 		}
+
+	}
+
+	// ... or we can eject them because we have all the requisite powers...
+	if(	gAgent.hasPowerInGroup(mGroupID, GP_ROLE_REMOVE_MEMBER) &&
+		!member_is_owner)
+	{
+		if( gAgent.hasPowerInGroup(mGroupID, GP_MEMBER_EJECT))
+		{
+			can_eject_members = TRUE;
+		}
+		
+		if( gAgent.hasPowerInGroup(mGroupID, GP_GROUP_BAN_ACCESS))
+		{
+			can_ban_members = TRUE;
+		}
 	}
 
+
+	uuid_vec_t::const_iterator member_iter = selected_members.begin();
+	uuid_vec_t::const_iterator member_end = selected_members.end();
+	for ( ; member_iter != member_end; ++member_iter)
+	{
+		// Don't count the agent.
+		if ((*member_iter) == gAgent.getID())
+		{
+			can_eject_members = FALSE;
+			can_ban_members = FALSE;
+		}
+	}
+
+	mBanBtn->setEnabled(can_ban_members);
 	mEjectBtn->setEnabled(can_eject_members);
 }
 
@@ -1125,61 +1193,26 @@ void LLPanelGroupMembersSubTab::onEjectMembers(void *userdata)
 }
 
 void LLPanelGroupMembersSubTab::handleEjectMembers()
-{	
+{
+	//send down an eject message
+	uuid_vec_t selected_members;
+
 	std::vector<LLScrollListItem*> selection = mMembersList->getAllSelected();
 	if (selection.empty()) return;
-	
-	S32 selection_count = selection.size();
-	if (selection_count == 1)
-	{
-		LLSD args;
-		LLUUID selected_avatar = mMembersList->getValue().asUUID();
-		std::string fullname = LLSLURL("agent", selected_avatar, "inspect").getSLURLString();
-		args["AVATAR_NAME"] = fullname;
-		LLSD payload;
-		LLNotificationsUtil::add("EjectGroupMemberWarning",
-								 args,
-								 payload,
-								 boost::bind(&LLPanelGroupMembersSubTab::handleEjectCallback, this, _1, _2));
-	}
-	else
-	{
-		LLSD args;
-		args["COUNT"] = llformat("%d", selection_count);
-		LLSD payload;
-		LLNotificationsUtil::add("EjectGroupMembersWarning",
-								 args,
-								 payload,
-								 boost::bind(&LLPanelGroupMembersSubTab::handleEjectCallback, this, _1, _2));
-	}
-}
 
-bool LLPanelGroupMembersSubTab::handleEjectCallback(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-	if (0 == option) // Eject button
+	std::vector<LLScrollListItem*>::iterator itor;
+	for (itor = selection.begin() ; 
+		 itor != selection.end(); ++itor)
 	{
-		//send down an eject message
-		uuid_vec_t selected_members;
-		
-		std::vector<LLScrollListItem*> selection = mMembersList->getAllSelected();
-		if (selection.empty()) return false;
-		
-		std::vector<LLScrollListItem*>::iterator itor;
-		for (itor = selection.begin() ;
-			 itor != selection.end(); ++itor)
-		{
-			LLUUID member_id = (*itor)->getUUID();
-			selected_members.push_back( member_id );
-		}
-		
-		mMembersList->deleteSelectedItems();
-		
-		sendEjectNotifications(mGroupID, selected_members);
-		
-		LLGroupMgr::getInstance()->sendGroupMemberEjects(mGroupID, selected_members);
+		LLUUID member_id = (*itor)->getUUID();
+		selected_members.push_back( member_id );
 	}
-	return false;
+
+	mMembersList->deleteSelectedItems();
+
+	sendEjectNotifications(mGroupID, selected_members);
+
+	LLGroupMgr::getInstance()->sendGroupMemberEjects(mGroupID, selected_members);
 }
 
 void LLPanelGroupMembersSubTab::sendEjectNotifications(const LLUUID& group_id, const uuid_vec_t& selected_members)
@@ -1207,12 +1240,11 @@ void LLPanelGroupMembersSubTab::handleRoleCheck(const LLUUID& role_id,
 
 	//add that the user is requesting to change the roles for selected
 	//members
-	U64 powers_all_have  = 0xffffffffffffLL;
+	U64 powers_all_have  = GP_ALL_POWERS;
 	U64 powers_some_have = 0;
 
 	BOOL   is_owner_role = ( gdatap->mOwnerRole == role_id );
 	LLUUID member_id;
-	
 
 	std::vector<LLScrollListItem*> selection = mMembersList->getAllSelected();
 	if (selection.empty())
@@ -1223,7 +1255,6 @@ void LLPanelGroupMembersSubTab::handleRoleCheck(const LLUUID& role_id,
 	for (std::vector<LLScrollListItem*>::iterator itor = selection.begin() ; 
 		 itor != selection.end(); ++itor)
 	{
-
 		member_id = (*itor)->getUUID();
 
 		//see if we requested a change for this member before
@@ -1289,7 +1320,6 @@ void LLPanelGroupMembersSubTab::handleRoleCheck(const LLUUID& role_id,
 					 FALSE);
 }
 
-
 // static 
 void LLPanelGroupMembersSubTab::onRoleCheck(LLUICtrl* ctrl, void* user_data)
 {
@@ -1328,6 +1358,15 @@ void LLPanelGroupMembersSubTab::activate()
 		update(GC_ALL);
 		mActivated = true;
 	}
+	else
+	{
+		LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
+		// Members can be removed outside of this tab, checking changes
+		if (!gdatap || (gdatap->isMemberDataComplete() && gdatap->mMembers.size() != mMembersList->getItemCount()))
+		{
+			update(GC_MEMBER_DATA);
+		}
+	}
 }
 
 void LLPanelGroupMembersSubTab::deactivate()
@@ -1731,13 +1770,12 @@ void LLPanelGroupMembersSubTab::updateMembers()
 		return;
 	}
 
-	//cleanup list only for first iretation
+	//cleanup list only for first iteration
 	if(mMemberProgress == gdatap->mMembers.begin())
 	{
 		mMembersList->deleteAllItems();
 	}
 
-
 	LLGroupMgrGroupData::member_list_t::iterator end = gdatap->mMembers.end();
 
 	LLTimer update_time;
@@ -1806,6 +1844,12 @@ void LLPanelGroupMembersSubTab::updateMembers()
 	handleMemberSelect();
 }
 
+void LLPanelGroupMembersSubTab::onBanMember(void* user_data)
+{
+	LLPanelGroupMembersSubTab* self = static_cast<LLPanelGroupMembersSubTab*>(user_data);
+	self->handleBanMember();
+}
+
 // [FS:CR] FIRE-12276
 void LLPanelGroupMembersSubTab::onExportMembersToXML()
 {
@@ -1845,11 +1889,38 @@ void LLPanelGroupMembersSubTab::onExportMembersToXML()
 }
 // [/FS:CR] FIRE-12276
 
+void LLPanelGroupMembersSubTab::handleBanMember()
+{
+	LLGroupMgrGroupData* gdatap	= LLGroupMgr::getInstance()->getGroupData(mGroupID);
+	if(!gdatap) 
+	{
+		LL_WARNS("Groups") << "Unable to get group data for group " << mGroupID << LL_ENDL;
+		return;
+	}
 
-////////////////////////////
-// LLPanelGroupRolesSubTab
-////////////////////////////
+	std::vector<LLScrollListItem*> selection = mMembersList->getAllSelected();
+	if(selection.empty())
+	{
+		return;
+	}
 
+	uuid_vec_t ban_ids;
+	std::vector<LLScrollListItem*>::iterator itor;
+	for(itor = selection.begin(); itor != selection.end(); ++itor)
+	{
+		LLUUID ban_id = (*itor)->getUUID();
+		ban_ids.push_back(ban_id);
+		
+		LLGroupBanData ban_data;
+		gdatap->createBanEntry(ban_id, ban_data);
+	}	
+
+	LLGroupMgr::getInstance()->sendGroupBanRequest(LLGroupMgr::REQUEST_POST, mGroupID, LLGroupMgr::BAN_CREATE, ban_ids);
+	handleEjectMembers();
+}
+
+
+// LLPanelGroupRolesSubTab ///////////////////////////////////////////////
 static LLPanelInjector<LLPanelGroupRolesSubTab> t_panel_group_roles_subtab("panel_group_roles_subtab");
 
 LLPanelGroupRolesSubTab::LLPanelGroupRolesSubTab()
@@ -1863,7 +1934,7 @@ LLPanelGroupRolesSubTab::LLPanelGroupRolesSubTab()
 	mMemberVisibleCheck(NULL),
 	mDeleteRoleButton(NULL),
 	mCreateRoleButton(NULL),
-
+	mFirstOpen(TRUE),
 	mHasRoleChange(FALSE)
 {
 }
@@ -1965,6 +2036,7 @@ void LLPanelGroupRolesSubTab::deactivate()
 	LL_DEBUGS() << "LLPanelGroupRolesSubTab::deactivate()" << LL_ENDL;
 
 	LLPanelGroupSubTab::deactivate();
+	mFirstOpen = FALSE;
 }
 
 bool LLPanelGroupRolesSubTab::needsApply(std::string& mesg)
@@ -1972,6 +2044,12 @@ bool LLPanelGroupRolesSubTab::needsApply(std::string& mesg)
 	LL_DEBUGS() << "LLPanelGroupRolesSubTab::needsApply()" << LL_ENDL;
 
 	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
+	if(!gdatap)
+	{
+		llwarns << "Unable to get group data for group " << mGroupID << llendl;
+		return false;
+	}
+
 
 	return (mHasRoleChange								// Text changed in current role
 			|| (gdatap && gdatap->pendingRoleChanges()));	// Pending role changes in the group
@@ -1982,7 +2060,7 @@ bool LLPanelGroupRolesSubTab::apply(std::string& mesg)
 	LL_DEBUGS() << "LLPanelGroupRolesSubTab::apply()" << LL_ENDL;
 
 	saveRoleChanges(true);
-
+	mFirstOpen = FALSE;
 	LLGroupMgr::getInstance()->sendGroupRoleChanges(mGroupID);
 
 	notifyObservers();
@@ -2119,14 +2197,17 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc)
 		}
 	}
 
-	if (!gdatap || !gdatap->isMemberDataComplete())
+	if(!mFirstOpen)
 	{
-		LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mGroupID);
-	}
-	
-	if (!gdatap || !gdatap->isRoleMemberDataComplete())
-	{
-		LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(mGroupID);
+		if (!gdatap || !gdatap->isMemberDataComplete())
+		{
+			LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mGroupID);
+		}
+
+		if (!gdatap || !gdatap->isRoleMemberDataComplete())
+		{
+			LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(mGroupID);
+		}
 	}
 
 	if ((GC_ROLE_MEMBER_DATA == gc || GC_MEMBER_DATA == gc)
@@ -2142,6 +2223,9 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc)
 void LLPanelGroupRolesSubTab::onRoleSelect(LLUICtrl* ctrl, void* user_data)
 {
 	LLPanelGroupRolesSubTab* self = static_cast<LLPanelGroupRolesSubTab*>(user_data);
+	if (!self) 
+		return;
+
 	self->handleRoleSelect();
 }
 
@@ -2321,41 +2405,116 @@ void LLPanelGroupRolesSubTab::handleActionCheck(LLUICtrl* ctrl, bool force)
 	LLRoleAction* rap = (LLRoleAction*)action_item->getUserdata();
 	U64 power = rap->mPowerBit;
 
-	if (check->get())
+	bool isEnablingAbility = check->get();
+	LLRoleData rd;
+	LLSD args;
+
+	if (isEnablingAbility &&
+		!force && 
+		((GP_ROLE_ASSIGN_MEMBER == power) || (GP_ROLE_CHANGE_ACTIONS == power) ))
 	{
-		if (!force && (    (GP_ROLE_ASSIGN_MEMBER == power)
-						|| (GP_ROLE_CHANGE_ACTIONS == power) ))
+		// Uncheck the item, for now.  It will be
+		// checked if they click 'Yes', below.
+		check->set(FALSE);
+
+		LLRoleData rd;
+		LLSD args;
+
+		if ( gdatap->getRoleData(role_id, rd) )
 		{
-			// Uncheck the item, for now.  It will be
-			// checked if they click 'Yes', below.
-			check->set(FALSE);
-
-			LLRoleData rd;
-			LLSD args;
-
-			if ( gdatap->getRoleData(role_id, rd) )
+			args["ACTION_NAME"] = rap->mDescription;
+			args["ROLE_NAME"] = rd.mRoleName;
+			mHasModal = TRUE;
+			std::string warning = "AssignDangerousActionWarning";
+			if (GP_ROLE_CHANGE_ACTIONS == power)
 			{
-				args["ACTION_NAME"] = rap->mDescription;
-				args["ROLE_NAME"] = rd.mRoleName;
-				mHasModal = TRUE;
-				std::string warning = "AssignDangerousActionWarning";
-				if (GP_ROLE_CHANGE_ACTIONS == power)
-				{
-					warning = "AssignDangerousAbilityWarning";
-				}
-				LLNotificationsUtil::add(warning, args, LLSD(), boost::bind(&LLPanelGroupRolesSubTab::addActionCB, this, _1, _2, check));
-			}
-			else
-			{
-				LL_WARNS() << "Unable to look up role information for role id: "
-						<< role_id << LL_ENDL;
+				warning = "AssignDangerousAbilityWarning";
 			}
+			LLNotificationsUtil::add(warning, args, LLSD(), boost::bind(&LLPanelGroupRolesSubTab::addActionCB, this, _1, _2, check));
 		}
 		else
 		{
-			gdatap->addRolePower(role_id,power);
+			LL_WARNS() << "Unable to look up role information for role id: "
+					<< role_id << LL_ENDL;
 		}
 	}
+
+	if(GP_GROUP_BAN_ACCESS == power)
+	{
+		std::string warning = isEnablingAbility ? "AssignBanAbilityWarning" : "RemoveBanAbilityWarning";
+
+		//////////////////////////////////////////////////////////////////////////
+		// Get role data for both GP_ROLE_REMOVE_MEMBER and GP_MEMBER_EJECT
+		// Add description and role name to LLSD
+		// Pop up dialog saying "Yo, you also granted these other abilities when you did this!"
+		if ( gdatap->getRoleData(role_id, rd) )
+		{
+			args["ACTION_NAME"] = rap->mDescription;
+			args["ROLE_NAME"] = rd.mRoleName;
+			mHasModal = TRUE;
+			
+			std::vector<LLScrollListItem*> all_data = mAllowedActionsList->getAllData();
+			std::vector<LLScrollListItem*>::iterator ad_it = all_data.begin();
+			std::vector<LLScrollListItem*>::iterator ad_end = all_data.end();
+			LLRoleAction* adp;
+			for( ; ad_it != ad_end; ++ad_it)
+			{
+				adp = (LLRoleAction*)(*ad_it)->getUserdata();
+				if(adp->mPowerBit == GP_MEMBER_EJECT)
+				{
+					args["ACTION_NAME_2"] = adp->mDescription;
+				}
+				else if(adp->mPowerBit == GP_ROLE_REMOVE_MEMBER)
+				{
+					args["ACTION_NAME_3"] = adp->mDescription;
+				}
+			}
+		
+			LLNotificationsUtil::add(warning, args);
+		}
+		else
+		{
+			llwarns << "Unable to look up role information for role id: "
+				<< role_id << llendl;
+		}
+		
+		//////////////////////////////////////////////////////////////////////////
+
+		LLGroupMgrGroupData::role_list_t::iterator rit = gdatap->mRoles.find(role_id);
+		U64 current_role_powers = GP_NO_POWERS;
+		if (rit != gdatap->mRoles.end())
+		{
+			current_role_powers = ((*rit).second->getRoleData().mRolePowers);
+		}
+
+		if(isEnablingAbility)
+		{
+			power |= (GP_ROLE_REMOVE_MEMBER | GP_MEMBER_EJECT);
+			current_role_powers |= power;
+		}
+		else
+		{
+			current_role_powers &= ~GP_GROUP_BAN_ACCESS;
+		}
+
+		mAllowedActionsList->deleteAllItems();
+		buildActionsList(	mAllowedActionsList,
+			current_role_powers,
+			current_role_powers,				
+			boost::bind(&LLPanelGroupRolesSubTab::handleActionCheck, this, _1, false),
+			TRUE,
+			FALSE,
+			FALSE);
+
+	}
+	
+	//////////////////////////////////////////////////////////////////////////
+	// Adding non-specific ability to role
+	//////////////////////////////////////////////////////////////////////////
+	if(isEnablingAbility)
+	{
+		gdatap->addRolePower(role_id, power);
+	}
 	else
 	{
 		gdatap->removeRolePower(role_id,power);
@@ -2363,6 +2522,7 @@ void LLPanelGroupRolesSubTab::handleActionCheck(LLUICtrl* ctrl, bool force)
 
 	mHasRoleChange = TRUE;
 	notifyObservers();
+
 }
 
 bool LLPanelGroupRolesSubTab::addActionCB(const LLSD& notification, const LLSD& response, LLCheckBoxCtrl* check)
@@ -2382,7 +2542,6 @@ bool LLPanelGroupRolesSubTab::addActionCB(const LLSD& notification, const LLSD&
 	return false;
 }
 
-
 // static
 void LLPanelGroupRolesSubTab::onPropertiesKey(LLLineEditor* ctrl, void* user_data)
 {
@@ -2560,13 +2719,28 @@ void LLPanelGroupRolesSubTab::saveRoleChanges(bool select_saved_role)
 		mHasRoleChange = FALSE;
 	}
 }
-////////////////////////////
-// LLPanelGroupActionsSubTab
-////////////////////////////
 
+void LLPanelGroupRolesSubTab::setGroupID(const LLUUID& id)
+{
+	if(mRolesList) mRolesList->deleteAllItems();
+	if(mAssignedMembersList) mAssignedMembersList->deleteAllItems();
+	if(mAllowedActionsList) mAllowedActionsList->deleteAllItems();
+
+	if(mRoleName) mRoleName->clear();
+	if(mRoleDescription) mRoleDescription->clear();
+	if(mRoleTitle) mRoleTitle->clear();
+
+	mHasRoleChange = FALSE;
+
+	setFooterEnabled(FALSE);
+
+	LLPanelGroupSubTab::setGroupID(id);
+}
+
+
+// LLPanelGroupActionsSubTab /////////////////////////////////////////////
 static LLPanelInjector<LLPanelGroupActionsSubTab> t_panel_group_actions_subtab("panel_group_actions_subtab");
 
-
 LLPanelGroupActionsSubTab::LLPanelGroupActionsSubTab()
 : LLPanelGroupSubTab()
 {
@@ -2739,34 +2913,296 @@ void LLPanelGroupActionsSubTab::handleActionSelect()
 	}
 }
 
-void LLPanelGroupRoles::setGroupID(const LLUUID& id)
+void LLPanelGroupActionsSubTab::setGroupID(const LLUUID& id)
 {
-	LLPanelGroupTab::setGroupID(id);
-	
-	LLPanelGroupMembersSubTab* group_members_tab = findChild<LLPanelGroupMembersSubTab>("members_sub_tab");
-	LLPanelGroupRolesSubTab*  group_roles_tab = findChild<LLPanelGroupRolesSubTab>("roles_sub_tab");
-	LLPanelGroupActionsSubTab* group_actions_tab = findChild<LLPanelGroupActionsSubTab>("actions_sub_tab");
+	if(mActionList) mActionList->deleteAllItems();
+	if(mActionRoles) mActionRoles->deleteAllItems();
+	if(mActionMembers) mActionMembers->deleteAllItems();
 
-	if(group_members_tab) group_members_tab->setGroupID(id);
-	if(group_roles_tab) group_roles_tab->setGroupID(id);
-	if(group_actions_tab) group_actions_tab->setGroupID(id);
+	if(mActionDescription) mActionDescription->clear();
 
-	LLButton* button = getChild<LLButton>("member_invite");
-	if ( button )
-		button->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_MEMBER_INVITE));
-	// [FS:CR] FIRE-12276
-	button = getChild<LLButton>("export_list");
-	if (button)
-		button->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_MEMBER_VISIBLE_IN_DIR));
-	// [/FS:CR]
-
-	if(mSubTabContainer)
-		// <FS:Ansariel> FIRE-13501: Activate "Members" tab by default
-		//mSubTabContainer->selectTab(1);
-		mSubTabContainer->selectTab(0);
-		// </FS:Ansariel>
-
-	activate();
+	LLPanelGroupSubTab::setGroupID(id);
 }
 
+// LLPanelGroupBanListSubTab /////////////////////////////////////////////
+static LLPanelInjector<LLPanelGroupBanListSubTab> t_panel_group_ban_subtab("panel_group_banlist_subtab");
 
+LLPanelGroupBanListSubTab::LLPanelGroupBanListSubTab()
+	: LLPanelGroupSubTab(),
+	  mBanList(NULL),
+	  mCreateBanButton(NULL),
+	  mDeleteBanButton(NULL)
+{}
+
+BOOL LLPanelGroupBanListSubTab::postBuildSubTab(LLView* root)
+{
+	LLPanelGroupSubTab::postBuildSubTab(root);
+
+	// Upcast parent so we can ask it for sibling controls.
+	LLPanelGroupRoles* parent = (LLPanelGroupRoles*)root;
+
+	// Look recursively from the parent to find all our widgets.
+	bool recurse = true;
+	
+	mHeader	= parent->getChild<LLPanel>("banlist_header", recurse);
+	mFooter	= parent->getChild<LLPanel>("banlist_footer", recurse);
+	
+	mBanList = parent->getChild<LLNameListCtrl>("ban_list", recurse);
+	
+	mCreateBanButton		= parent->getChild<LLButton>("ban_create", recurse);
+	mDeleteBanButton		= parent->getChild<LLButton>("ban_delete", recurse);
+	mRefreshBanListButton	= parent->getChild<LLButton>("ban_refresh", recurse);
+	mBanCountText			= parent->getChild<LLTextBase>("ban_count", recurse);
+
+	if(!mBanList || !mCreateBanButton || !mDeleteBanButton || !mRefreshBanListButton || !mBanCountText)
+		return FALSE;
+
+	mBanList->setCommitOnSelectionChange(TRUE);
+	mBanList->setCommitCallback(onBanEntrySelect, this);
+
+	mCreateBanButton->setClickedCallback(onCreateBanEntry, this);
+	mCreateBanButton->setEnabled(FALSE);
+
+	mDeleteBanButton->setClickedCallback(onDeleteBanEntry, this);
+	mDeleteBanButton->setEnabled(FALSE);
+	
+	mRefreshBanListButton->setClickedCallback(onRefreshBanList, this);
+	mRefreshBanListButton->setEnabled(FALSE);
+
+	setBanCount(0);
+
+	mBanList->setOnNameListCompleteCallback(boost::bind(&LLPanelGroupBanListSubTab::onBanListCompleted, this, _1));
+	
+	populateBanList();
+
+	setFooterEnabled(FALSE);
+	return TRUE;
+}
+
+void LLPanelGroupBanListSubTab::activate()
+{
+	LLPanelGroupSubTab::activate();
+
+	mBanList->deselectAllItems();
+	mDeleteBanButton->setEnabled(FALSE);
+
+	LLGroupMgrGroupData * group_datap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
+	if (group_datap)
+	{
+		mCreateBanButton->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_GROUP_BAN_ACCESS) &&
+									 group_datap->mBanList.size() < GB_MAX_BANNED_AGENTS);
+		setBanCount(group_datap->mBanList.size());
+	}
+	else
+	{
+		mCreateBanButton->setEnabled(FALSE);
+		setBanCount(0);
+	}
+
+	// BAKER: Should I really request everytime activate() is called?
+	//		  Perhaps I should only do it on a force refresh, or if an action on the list happens...
+	//		  Because it's not going to live-update the list anyway... You'd have to refresh if you 
+	//		  wanted to see someone else's additions anyway...
+	//		  
+	LLGroupMgr::getInstance()->sendGroupBanRequest(LLGroupMgr::REQUEST_GET, mGroupID);
+
+	setFooterEnabled(FALSE);
+	update(GC_ALL);
+}
+
+void LLPanelGroupBanListSubTab::update(LLGroupChange gc)
+{
+	populateBanList();
+}
+
+void LLPanelGroupBanListSubTab::draw()
+{
+	LLPanelGroupSubTab::draw();
+
+	// BAKER: Might be good to put it here instead of update, maybe.. See how often draw gets hit.
+	//if(
+	//	populateBanList();
+}
+
+void LLPanelGroupBanListSubTab::onBanEntrySelect(LLUICtrl* ctrl, void* user_data)
+{
+	LLPanelGroupBanListSubTab* self = static_cast<LLPanelGroupBanListSubTab*>(user_data);
+	if (!self) 
+		return;
+
+	self->handleBanEntrySelect();
+}
+
+void LLPanelGroupBanListSubTab::handleBanEntrySelect()
+{
+	if (gAgent.hasPowerInGroup(mGroupID, GP_GROUP_BAN_ACCESS))
+	{
+		mDeleteBanButton->setEnabled(TRUE);
+	}
+}
+
+void LLPanelGroupBanListSubTab::onCreateBanEntry(void* user_data)
+{
+	LLPanelGroupBanListSubTab* self = static_cast<LLPanelGroupBanListSubTab*>(user_data);
+	if (!self) 
+		return;
+
+	self->handleCreateBanEntry();
+}
+
+void LLPanelGroupBanListSubTab::handleCreateBanEntry()
+{
+	LLFloaterGroupBulkBan::showForGroup(mGroupID);
+	//populateBanList();
+}
+
+void LLPanelGroupBanListSubTab::onDeleteBanEntry(void* user_data)
+{
+	LLPanelGroupBanListSubTab* self = static_cast<LLPanelGroupBanListSubTab*>(user_data);
+	if (!self) 
+		return;
+
+	self->handleDeleteBanEntry();
+}
+
+void LLPanelGroupBanListSubTab::handleDeleteBanEntry()
+{
+	LLGroupMgrGroupData* gdatap	= LLGroupMgr::getInstance()->getGroupData(mGroupID);
+	if(!gdatap) 
+	{
+		LL_WARNS("Groups") << "Unable to get group data for group " << mGroupID << LL_ENDL;
+		return;
+	}
+
+	std::vector<LLScrollListItem*> selection = mBanList->getAllSelected();
+	if(selection.empty())
+	{
+		return;
+	}
+
+	bool can_ban_members = false;
+	if (gAgent.isGodlike() ||
+		gAgent.hasPowerInGroup(mGroupID, GP_GROUP_BAN_ACCESS))
+	{
+		can_ban_members	= true;
+	}
+	
+	// Owners can ban anyone in the group.
+	LLGroupMgrGroupData::member_list_t::iterator mi = gdatap->mMembers.find(gAgent.getID());
+	if (mi != gdatap->mMembers.end())
+	{
+		LLGroupMemberData* member_data = (*mi).second;
+		if ( member_data && member_data->isInRole(gdatap->mOwnerRole) )
+		{
+			can_ban_members	= true;
+		}
+	}
+		
+	if(!can_ban_members)
+		return;
+
+	std::vector<LLUUID> ban_ids;
+	std::vector<LLScrollListItem*>::iterator itor;
+	for(itor = selection.begin(); itor != selection.end(); ++itor)
+	{
+		LLUUID ban_id = (*itor)->getUUID();
+		ban_ids.push_back(ban_id);
+		
+		gdatap->removeBanEntry(ban_id);
+		mBanList->removeNameItem(ban_id);
+	
+		// Removing an item removes the selection, we shouldn't be able to click
+		// the button anymore until we reselect another entry.
+		mDeleteBanButton->setEnabled(FALSE);
+	}
+
+	// update ban-count related elements
+	mCreateBanButton->setEnabled(TRUE);
+	setBanCount(gdatap->mBanList.size());
+	
+	LLGroupMgr::getInstance()->sendGroupBanRequest(LLGroupMgr::REQUEST_POST, mGroupID, LLGroupMgr::BAN_DELETE, ban_ids);
+}
+
+void LLPanelGroupBanListSubTab::onRefreshBanList(void* user_data)
+{
+	LLPanelGroupBanListSubTab* self = static_cast<LLPanelGroupBanListSubTab*>(user_data);
+	if (!self) 
+		return;
+
+	self->handleRefreshBanList();
+}
+
+void LLPanelGroupBanListSubTab::handleRefreshBanList()
+{
+	mRefreshBanListButton->setEnabled(FALSE);
+	LLGroupMgr::getInstance()->sendGroupBanRequest(LLGroupMgr::REQUEST_GET, mGroupID);
+}
+
+void LLPanelGroupBanListSubTab::onBanListCompleted(bool isComplete)
+{
+	if(isComplete)
+	{
+		mRefreshBanListButton->setEnabled(TRUE);
+		populateBanList();
+	}
+}
+
+void LLPanelGroupBanListSubTab::setBanCount(U32 ban_count)
+{
+	LLStringUtil::format_map_t args;
+	args["[COUNT]"] = llformat("%d", ban_count);
+	args["[LIMIT]"] = llformat("%d", GB_MAX_BANNED_AGENTS);
+	mBanCountText->setText(getString("ban_count_template", args));
+}
+
+void LLPanelGroupBanListSubTab::populateBanList()
+{
+	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
+	if(!gdatap) 
+	{
+		LL_WARNS("Groups") << "Unable to get group data for group " << mGroupID << LL_ENDL;
+		return;
+	}
+
+	mBanList->deleteAllItems();
+	std::map<LLUUID,LLGroupBanData>::const_iterator entry = gdatap->mBanList.begin();
+	for(; entry != gdatap->mBanList.end(); entry++)
+	{
+		LLNameListCtrl::NameItem ban_entry;
+		ban_entry.value = entry->first;
+		LLGroupBanData bd = entry->second;
+		
+		ban_entry.columns.add().column("name").font.name("SANSSERIF_SMALL").style("NORMAL");
+
+		// Check out utc_to_pacific_time()
+
+		std::string ban_date_str = bd.mBanDate.toHTTPDateString("%Y/%m/%d");
+		time_t utc_time;
+		utc_time = time_corrected();
+		LLSD substitution;
+		substitution["datetime"] = (S32) utc_time;
+		LLStringUtil::format (ban_date_str, substitution);
+
+		LL_INFOS("BAKER") << "[BAKER] BAN_DATE: " << bd.mBanDate.toHTTPDateString("%Y/%m/%d") << LL_ENDL;
+		LL_INFOS("BAKER") << "[BAKER] BAN_DATE_MODIFIED: " << ban_date_str << LL_ENDL;
+
+		//ban_entry.columns.add().column("ban_date").value(ban_date_str.font.name("SANSSERIF_SMALL").style("NORMAL");
+		ban_entry.columns.add().column("ban_date").value(bd.mBanDate.toHTTPDateString("%Y/%m/%d")).font.name("SANSSERIF_SMALL").style("NORMAL");
+
+		mBanList->addNameItemRow(ban_entry);
+	}
+	 
+	mRefreshBanListButton->setEnabled(TRUE);
+	mCreateBanButton->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_GROUP_BAN_ACCESS) &&
+								 gdatap->mBanList.size() < GB_MAX_BANNED_AGENTS);
+	setBanCount(gdatap->mBanList.size());
+}
+
+void LLPanelGroupBanListSubTab::setGroupID(const LLUUID& id)
+{
+	if(mBanList)
+		mBanList->deleteAllItems();
+
+	setFooterEnabled(FALSE);
+	LLPanelGroupSubTab::setGroupID(id); 
+}
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h
index 86499fa69f..e8c0ab82ea 100755
--- a/indra/newview/llpanelgrouproles.h
+++ b/indra/newview/llpanelgrouproles.h
@@ -39,11 +39,9 @@ class LLScrollListCtrl;
 class LLScrollListItem;
 class LLTextEditor;
 
-// Forward declare for friend usage.
-//virtual BOOL LLPanelGroupSubTab::postBuildSubTab(LLView*);
-
 typedef std::map<std::string,std::string> icon_map_t;
 
+
 class LLPanelGroupRoles : public LLPanelGroupTab
 {
 public:
@@ -92,6 +90,7 @@ protected:
 	std::string				mWantApplyMesg;
 };
 
+
 class LLPanelGroupSubTab : public LLPanelGroupTab
 {
 public:
@@ -143,10 +142,14 @@ protected:
 	icon_map_t	mActionIcons;
 
 	bool mActivated;
-
+	
+	bool mHasGroupBanPower; // Used to communicate between action sets due to the dependency between
+							// GP_GROUP_BAN_ACCESS and GP_EJECT_MEMBER and GP_ROLE_REMOVE_MEMBER
+	
 	void setOthersVisible(BOOL b);
 };
 
+
 class LLPanelGroupMembersSubTab : public LLPanelGroupSubTab
 {
 public:
@@ -173,6 +176,10 @@ public:
 	void handleRoleCheck(const LLUUID& role_id,
 						 LLRoleMemberChangeType type);
 
+	static void onBanMember(void* user_data);
+	void handleBanMember();
+
+
 	void applyMemberChanges();
 	bool addOwnerCB(const LLSD& notification, const LLSD& response);
 
@@ -209,6 +216,7 @@ protected:
 	LLScrollListCtrl*	mAssignedRolesList;
 	LLScrollListCtrl*	mAllowedActionsList;
 	LLButton*           mEjectBtn;
+	LLButton*			mBanBtn;
 
 	BOOL mChanged;
 	BOOL mPendingMemberUpdate;
@@ -229,6 +237,7 @@ private:
 	void onExportMembersToXML();
 };
 
+
 class LLPanelGroupRolesSubTab : public LLPanelGroupSubTab
 {
 public:
@@ -251,7 +260,7 @@ public:
 
 	static void onActionCheck(LLUICtrl*, void*);
 	bool addActionCB(const LLSD& notification, const LLSD& response, LLCheckBoxCtrl* check);
-
+	
 	static void onPropertiesKey(LLLineEditor*, void*);
 
 	void onDescriptionKeyStroke(LLTextEditor* caller);
@@ -270,6 +279,9 @@ public:
 	void saveRoleChanges(bool select_saved_role);
 
 	virtual void setGroupID(const LLUUID& id);
+
+	BOOL	mFirstOpen;
+
 protected:
 	void handleActionCheck(LLUICtrl* ctrl, bool force);
 	LLSD createRoleItem(const LLUUID& role_id, std::string name, std::string title, S32 members);
@@ -291,6 +303,7 @@ protected:
 	std::string mRemoveEveryoneTxt;
 };
 
+
 class LLPanelGroupActionsSubTab : public LLPanelGroupSubTab
 {
 public:
@@ -318,4 +331,46 @@ protected:
 };
 
 
+class LLPanelGroupBanListSubTab : public LLPanelGroupSubTab
+{
+public:
+	LLPanelGroupBanListSubTab();
+	virtual ~LLPanelGroupBanListSubTab() {}
+
+	virtual BOOL postBuildSubTab(LLView* root);
+
+	virtual void activate();
+	virtual void update(LLGroupChange gc);
+	virtual void draw();
+
+	static void onBanEntrySelect(LLUICtrl* ctrl, void* user_data);
+	void handleBanEntrySelect();
+	
+	static void onCreateBanEntry(void* user_data);
+	void handleCreateBanEntry();
+	
+	static void onDeleteBanEntry(void* user_data);
+	void handleDeleteBanEntry();
+
+	static void onRefreshBanList(void* user_data);
+	void handleRefreshBanList();
+
+	void onBanListCompleted(bool isComplete);
+
+protected:
+	void setBanCount(U32 ban_count);
+	void populateBanList();
+
+public:
+	virtual void setGroupID(const LLUUID& id);
+
+protected:
+	LLNameListCtrl* mBanList;
+	LLButton* mCreateBanButton;
+	LLButton* mDeleteBanButton;
+	LLButton* mRefreshBanListButton;
+	LLTextBase* mBanCountText;
+
+};
+
 #endif // LL_LLPANELGROUPROLES_H
diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp
index d4b6dfe503..7425a8d267 100755
--- a/indra/newview/llpanelplaceprofile.cpp
+++ b/indra/newview/llpanelplaceprofile.cpp
@@ -500,8 +500,9 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel,
 				gCacheName->getGroup(parcel->getGroupID(),
 								boost::bind(&LLPanelPlaceInfo::onNameCache, mRegionGroupText, _2));
 
-				gCacheName->getGroup(parcel->getGroupID(),
-								boost::bind(&LLPanelPlaceInfo::onNameCache, mParcelOwner, _2));
+				std::string owner =
+					LLSLURL("group", parcel->getGroupID(), "inspect").getSLURLString();
+				mParcelOwner->setText(owner);
 			}
 			else
 			{
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index c7183a715c..aa3ca68980 100755
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -45,6 +45,7 @@
 //#include "llfloaterimsession.h"
 #include "fsfloaterim.h"
 // </FS:Ansariel> [FS communication UI]
+#include "llavataractions.h"
 
 const S32 BOTTOM_PAD = VPAD * 3;
 const S32 IGNORE_BTN_TOP_DELTA = 3*VPAD;//additional ignore_btn padding
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index d2c9ef6b85..3111a5cc3c 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -2835,6 +2835,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("GetObjectCost");
 	capabilityNames.append("GetObjectPhysicsData");
 	capabilityNames.append("GetTexture");
+	capabilityNames.append("GroupAPIv1");
 	capabilityNames.append("GroupMemberData");
 	capabilityNames.append("GroupProposalBallot");
 	capabilityNames.append("HomeLocation");
diff --git a/indra/newview/roles_constants.h b/indra/newview/roles_constants.h
index effd15ea72..8fd7978fa1 100755
--- a/indra/newview/roles_constants.h
+++ b/indra/newview/roles_constants.h
@@ -53,98 +53,100 @@ enum LLRoleChangeType
 
 // KNOWN HOLES: use these for any single bit powers you need
 // bit 0x1 << 46
-// bit 0x1 << 49 and above
+// bit 0x1 << 52 and above
 
 // These powers were removed to make group roles simpler
 // bit 0x1 << 41 (GP_ACCOUNTING_VIEW)
 // bit 0x1 << 46 (GP_PROPOSAL_VIEW)
 
 const U64 GP_NO_POWERS = 0x0;
-const U64 GP_ALL_POWERS = 0xFFFFFFFFFFFFFFFFLL;
+const U64 GP_ALL_POWERS = 0xFFFFffffFFFFffffLL;
 
 // Membership
-const U64 GP_MEMBER_INVITE		= 0x1 << 1;		// Invite member
-const U64 GP_MEMBER_EJECT			= 0x1 << 2;		// Eject member from group
-const U64 GP_MEMBER_OPTIONS		= 0x1 << 3;		// Toggle "Open enrollment" and change "Signup Fee"
-const U64 GP_MEMBER_VISIBLE_IN_DIR = 0x1LL << 47;
+const U64 GP_MEMBER_INVITE				= 0x1LL << 1;	// Invite member
+const U64 GP_MEMBER_EJECT				= 0x1LL << 2;	// Eject member from group
+const U64 GP_MEMBER_OPTIONS				= 0x1LL << 3;	// Toggle "Open enrollment" and change "Signup Fee"
+const U64 GP_MEMBER_VISIBLE_IN_DIR		= 0x1LL << 47;
 
 // Roles
-const U64 GP_ROLE_CREATE			= 0x1 << 4;		// Create new roles
-const U64 GP_ROLE_DELETE			= 0x1 << 5;		// Delete roles
-const U64 GP_ROLE_PROPERTIES		= 0x1 << 6;		// Change Role Names, Titles, and Descriptions (Of roles the user is in, only, or any role in group?)
-const U64 GP_ROLE_ASSIGN_MEMBER_LIMITED = 0x1 << 7; // Assign Member to a Role that the assigner is in
-const U64 GP_ROLE_ASSIGN_MEMBER	= 0x1 << 8;		// Assign Member to Role
-const U64 GP_ROLE_REMOVE_MEMBER	= 0x1 << 9;		// Remove Member from Role
-const U64 GP_ROLE_CHANGE_ACTIONS	= 0x1 << 10;	// Change actions a role can perform
+const U64 GP_ROLE_CREATE				= 0x1LL << 4;	// Create new roles
+const U64 GP_ROLE_DELETE				= 0x1LL << 5;	// Delete roles
+const U64 GP_ROLE_PROPERTIES			= 0x1LL << 6;	// Change Role Names, Titles, and Descriptions (Of roles the user is in, only, or any role in group?)
+const U64 GP_ROLE_ASSIGN_MEMBER_LIMITED	= 0x1LL << 7;	// Assign Member to a Role that the assigner is in
+const U64 GP_ROLE_ASSIGN_MEMBER			= 0x1LL << 8;	// Assign Member to Role
+const U64 GP_ROLE_REMOVE_MEMBER			= 0x1LL << 9;	// Remove Member from Role
+const U64 GP_ROLE_CHANGE_ACTIONS		= 0x1LL << 10;	// Change actions a role can perform
 
 // Group Identity
-const U64 GP_GROUP_CHANGE_IDENTITY = 0x1 << 11;	// Charter, insignia, 'Show In Group List', 'Publish on the web', 'Mature', all 'Show Member In Group Profile' checkboxes
+const U64 GP_GROUP_CHANGE_IDENTITY		= 0x1LL << 11;	// Charter, insignia, 'Show In Group List', 'Publish on the web', 'Mature', all 'Show Member In Group Profile' checkboxes
 
 // Parcel Management
-const U64 GP_LAND_DEED			= 0x1 << 12;	// Deed Land and Buy Land for Group
-const U64 GP_LAND_RELEASE			= 0x1 << 13;	// Release Land (to Gov. Linden)
-const U64 GP_LAND_SET_SALE_INFO	= 0x1 << 14;	// Set for sale info (Toggle "For Sale", Set Price, Set Target, Toggle "Sell objects with the land")
-const U64 GP_LAND_DIVIDE_JOIN		= 0x1 << 15;	// Divide and Join Parcels
+const U64 GP_LAND_DEED					= 0x1LL << 12;	// Deed Land and Buy Land for Group
+const U64 GP_LAND_RELEASE				= 0x1LL << 13;	// Release Land (to Gov. Linden)
+const U64 GP_LAND_SET_SALE_INFO			= 0x1LL << 14;	// Set for sale info (Toggle "For Sale", Set Price, Set Target, Toggle "Sell objects with the land")
+const U64 GP_LAND_DIVIDE_JOIN			= 0x1LL << 15;	// Divide and Join Parcels
 
 // Parcel Identity
-const U64 GP_LAND_FIND_PLACES		= 0x1 << 17;	// Toggle "Show in Find Places" and Set Category.
-const U64 GP_LAND_CHANGE_IDENTITY = 0x1 << 18;	// Change Parcel Identity: Parcel Name, Parcel Description, Snapshot, 'Publish on the web', and 'Mature' checkbox
-const U64 GP_LAND_SET_LANDING_POINT = 0x1 << 19;	// Set Landing Point
+const U64 GP_LAND_FIND_PLACES			= 0x1LL << 17;	// Toggle "Show in Find Places" and Set Category.
+const U64 GP_LAND_CHANGE_IDENTITY		= 0x1LL << 18;	// Change Parcel Identity: Parcel Name, Parcel Description, Snapshot, 'Publish on the web', and 'Mature' checkbox
+const U64 GP_LAND_SET_LANDING_POINT		= 0x1LL << 19;	// Set Landing Point
 
 // Parcel Settings
-const U64 GP_LAND_CHANGE_MEDIA	= 0x1 << 20;	// Change Media Settings
-const U64 GP_LAND_EDIT			= 0x1 << 21;	// Toggle Edit Land
-const U64 GP_LAND_OPTIONS			= 0x1 << 22;	// Toggle Set Home Point, Fly, Outside Scripts, Create/Edit Objects, Landmark, and Damage checkboxes
+const U64 GP_LAND_CHANGE_MEDIA			= 0x1LL << 20;	// Change Media Settings
+const U64 GP_LAND_EDIT					= 0x1LL << 21;	// Toggle Edit Land
+const U64 GP_LAND_OPTIONS				= 0x1LL << 22;	// Toggle Set Home Point, Fly, Outside Scripts, Create/Edit Objects, Landmark, and Damage checkboxes
 
 // Parcel Powers
-const U64 GP_LAND_ALLOW_EDIT_LAND = 0x1 << 23;	// Bypass Edit Land Restriction
-const U64 GP_LAND_ALLOW_FLY		= 0x1 << 24;	// Bypass Fly Restriction
-const U64 GP_LAND_ALLOW_CREATE	= 0x1 << 25;	// Bypass Create/Edit Objects Restriction
-const U64 GP_LAND_ALLOW_LANDMARK	= 0x1 << 26;	// Bypass Landmark Restriction
-const U64 GP_LAND_ALLOW_SET_HOME	= 0x1 << 28;	// Bypass Set Home Point Restriction
-const U64 GP_LAND_ALLOW_HOLD_EVENT	= 0x1LL << 41;	// Allowed to hold events on group-owned land
-
+const U64 GP_LAND_ALLOW_EDIT_LAND		= 0x1LL << 23;	// Bypass Edit Land Restriction
+const U64 GP_LAND_ALLOW_FLY				= 0x1LL << 24;	// Bypass Fly Restriction
+const U64 GP_LAND_ALLOW_CREATE			= 0x1LL << 25;	// Bypass Create/Edit Objects Restriction
+const U64 GP_LAND_ALLOW_LANDMARK		= 0x1LL << 26;	// Bypass Landmark Restriction
+const U64 GP_LAND_ALLOW_SET_HOME		= 0x1LL << 28;	// Bypass Set Home Point Restriction
+const U64 GP_LAND_ALLOW_HOLD_EVENT		= 0x1LL << 41;	// Allowed to hold events on group-owned land
 
 // Parcel Access
-const U64 GP_LAND_MANAGE_ALLOWED	= 0x1 << 29;	// Manage Allowed List
-const U64 GP_LAND_MANAGE_BANNED	= 0x1 << 30;	// Manage Banned List
-const U64 GP_LAND_MANAGE_PASSES	= 0x1LL << 31;	// Change Sell Pass Settings
-const U64 GP_LAND_ADMIN			= 0x1LL << 32;	// Eject and Freeze Users on the land
+const U64 GP_LAND_MANAGE_ALLOWED		= 0x1LL << 29;	// Manage Allowed List
+const U64 GP_LAND_MANAGE_BANNED			= 0x1LL << 30;	// Manage Banned List
+const U64 GP_LAND_MANAGE_PASSES			= 0x1LL << 31;	// Change Sell Pass Settings
+const U64 GP_LAND_ADMIN					= 0x1LL << 32;	// Eject and Freeze Users on the land
 
 // Parcel Content
-const U64 GP_LAND_RETURN_GROUP_SET	= 0x1LL << 33;	// Return objects on parcel that are set to group
-const U64 GP_LAND_RETURN_NON_GROUP	= 0x1LL << 34;	// Return objects on parcel that are not set to group
-const U64 GP_LAND_RETURN_GROUP_OWNED= 0x1LL << 48;	// Return objects on parcel that are owned by the group
+const U64 GP_LAND_RETURN_GROUP_SET		= 0x1LL << 33;	// Return objects on parcel that are set to group
+const U64 GP_LAND_RETURN_NON_GROUP		= 0x1LL << 34;	// Return objects on parcel that are not set to group
+const U64 GP_LAND_RETURN_GROUP_OWNED	= 0x1LL << 48;	// Return objects on parcel that are owned by the group
 
 // Select a power-bit based on an object's relationship to a parcel.
 const U64 GP_LAND_RETURN		= GP_LAND_RETURN_GROUP_OWNED 
 								| GP_LAND_RETURN_GROUP_SET	
 								| GP_LAND_RETURN_NON_GROUP;
 
-const U64 GP_LAND_GARDENING		= 0x1LL << 35;	// Parcel Gardening - plant and move linden trees
+const U64 GP_LAND_GARDENING				= 0x1LL << 35;	// Parcel Gardening - plant and move linden trees
 
 // Object Management
-const U64 GP_OBJECT_DEED			= 0x1LL << 36;	// Deed Object
-const U64 GP_OBJECT_MANIPULATE		= 0x1LL << 38;	// Manipulate Group Owned Objects (Move, Copy, Mod)
-const U64 GP_OBJECT_SET_SALE		= 0x1LL << 39;	// Set Group Owned Object for Sale
+const U64 GP_OBJECT_DEED				= 0x1LL << 36;	// Deed Object
+const U64 GP_OBJECT_MANIPULATE			= 0x1LL << 38;	// Manipulate Group Owned Objects (Move, Copy, Mod)
+const U64 GP_OBJECT_SET_SALE			= 0x1LL << 39;	// Set Group Owned Object for Sale
 
 // Accounting
-const U64 GP_ACCOUNTING_ACCOUNTABLE = 0x1LL << 40;	// Pay Group Liabilities and Receive Group Dividends
+const U64 GP_ACCOUNTING_ACCOUNTABLE		= 0x1LL << 40;	// Pay Group Liabilities and Receive Group Dividends
 
 // Notices
-const U64 GP_NOTICES_SEND			= 0x1LL << 42;	// Send Notices
-const U64 GP_NOTICES_RECEIVE		= 0x1LL << 43;	// Receive Notices and View Notice History
+const U64 GP_NOTICES_SEND				= 0x1LL << 42;	// Send Notices
+const U64 GP_NOTICES_RECEIVE			= 0x1LL << 43;	// Receive Notices and View Notice History
 
 // Proposals
 // TODO: _DEPRECATED suffix as part of vote removal - DEV-24856:
-const U64 GP_PROPOSAL_START		= 0x1LL << 44;	// Start Proposal
+const U64 GP_PROPOSAL_START				= 0x1LL << 44;	// Start Proposal
 // TODO: _DEPRECATED suffix as part of vote removal - DEV-24856:
-const U64 GP_PROPOSAL_VOTE		= 0x1LL << 45;	// Vote on Proposal
+const U64 GP_PROPOSAL_VOTE				= 0x1LL << 45;	// Vote on Proposal
 
 // Group chat moderation related
-const U64 GP_SESSION_JOIN = 0x1LL << 16; //can join session
-const U64 GP_SESSION_VOICE = 0x1LL << 27; //can hear/talk
-const U64 GP_SESSION_MODERATOR = 0x1LL << 37; //can mute people's session
+const U64 GP_SESSION_JOIN				= 0x1LL << 16;	//can join session
+const U64 GP_SESSION_VOICE				= 0x1LL << 27;	//can hear/talk
+const U64 GP_SESSION_MODERATOR			= 0x1LL << 37;	//can mute people's session
+
+// Group Banning
+const U64 GP_GROUP_BAN_ACCESS			= 0x1LL << 51;	// Allows access to ban / un-ban agents from a group.
 
 const U64 GP_DEFAULT_MEMBER = GP_ACCOUNTING_ACCOUNTABLE
 								| GP_LAND_ALLOW_SET_HOME
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 6683b1e004..50438d966d 100755
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -86,7 +86,7 @@ The Lindens are:
        top_pad="5"
        width="444"
        word_wrap="true">
-Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
+Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase, Baker
       </text_editor>
       <text
           follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 04d21e08f3..55705b21d2 100755
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -17,6 +17,7 @@
      layout="topleft"
      name="open_voice_conversation">
         <on_click function="Avatar.DoToSelected" parameter="open_voice_conversation"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_open_voice_conversation"/>
      </menu_item_call>	
      <menu_item_call
      label="Disconnect from voice"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e547c0afda..5fba3b50d9 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -507,7 +507,35 @@ Add this ability to &apos;[ROLE_NAME]&apos;?
      notext="No"
      yestext="Yes"/>
   </notification>
-  
+
+  <notification
+    icon="alertmodal.tga"
+    name="AssignBanAbilityWarning"
+    type="alertmodal">
+You are about to add the Ability &apos;[ACTION_NAME]&apos; to the Role &apos;[ROLE_NAME]&apos;.
+
+ *WARNING*
+Any Member in a Role with this Ability will also be granted the Abilities &apos;[ACTION_NAME_2]&apos; and &apos;[ACTION_NAME_3]&apos;
+    <usetemplate
+      name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+  icon="alertmodal.tga"
+  name="RemoveBanAbilityWarning"
+  type="alertmodal">
+You are removing the Ability &apos;[ACTION_NAME]&apos; to the Role &apos;[ROLE_NAME]&apos;.
+
+ *WARNING*
+Removing this ability will NOT remove the Abilities &apos;[ACTION_NAME_2]&apos; and &apos;[ACTION_NAME_3]&apos;.
+ 
+If you no longer wish to have these abilities granted to this role, disable them immediately!
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
     icon="alertmodal.tga"
     name="EjectGroupMemberWarning"
@@ -3863,6 +3891,28 @@ Leave Group?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="aler.tga"
+   name="GroupDepartError"
+   type="alert">
+Unable to leave group: [reason].
+      <tag>reason</tag>
+      <usetemplate
+       name="okbutton"
+       yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="GroupDepart"
+   type="alert">
+You have left the group [group_name].
+      <tag>group_name</tag>
+      <usetemplate
+       name="okbutton"
+       yestext="OK"/>
+  </notification>
+
   <notification
    icon="alert.tga"
    name="ConfirmKick"
diff --git a/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml b/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml
new file mode 100644
index 0000000000..509dcf354e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="330"
+ label="Ban Residents"
+ layout="topleft"
+ left="0"
+ name="bulk_ban_panel"
+ top="330"
+ width="210">
+  <panel.string
+   name="loading">
+    (loading...)
+  </panel.string>
+  <panel.string
+     name="ban_selection_too_large">
+    Group bans not sent: too many Residents selected. Group bans are limited to 100 per request.
+  </panel.string>
+  <panel.string
+     name="ban_not_permitted">
+    Group ban not sent: you do not have 'Manage ban list' ability.
+  </panel.string>
+  <panel.string
+     name="ban_limit_fail">
+    Group ban not sent: your group have reached limit of allowed ban records.
+  </panel.string>
+  <panel.string
+     name="partial_ban">
+    Some group bans were not sent:
+[REASONS]
+  </panel.string>
+  <panel.string
+     name="ban_failed">
+    Group bans were not sent:
+[REASONS]
+  </panel.string>
+  <panel.string
+     name="residents_already_banned">
+    - The following resident(s) are already banned: [RESIDENTS].
+  </panel.string>
+  <panel.string
+     name="ban_limit_reached">
+    - Ban limit reached, following agents not banned: [RESIDENTS].
+  </panel.string>
+  <panel.string
+     name="cant_ban_yourself">
+    - You cannot ban yourself from a group.
+  </panel.string>
+  <text
+   type="string"
+   length="1"
+   height="54"
+   layout="topleft"
+   left="7"
+   name="help_text"
+   top="28"
+   word_wrap="true"
+   width="200">
+    You can select multiple Residents to ban from your group. Click &apos;Open Resident Chooser&apos; to start.
+  </text>
+  <button
+   height="20"
+   label="Open Resident Chooser"
+   layout="topleft"
+   left_delta="-2"
+   name="add_button"
+   top_delta="44"
+   width="200" />
+  <name_list
+   allow_calling_card_drop="true"
+   column_padding="0"
+   height="174"
+   layout="topleft"
+   left_delta="0"
+   multi_select="true"
+   name="banned_agent_list"
+   tool_tip="Hold the Ctrl key and click Resident names to multi-select"
+   top_pad="4"
+   width="200" />
+  <button
+   height="20"
+   label="Remove Selected from List"
+   layout="topleft"
+   left_delta="0"
+   name="remove_button"
+   tool_tip="Removes the Residents selected above from the ban list"
+   top_pad="4"
+   width="200" />
+  <button
+   height="20"
+   label="Ban Residents"
+   layout="topleft"
+   left="4"
+   name="ban_button"
+   top_delta="30"
+   width="135" />
+  <button
+   height="20"
+   label="Cancel"
+   layout="topleft"
+   left_pad="2"
+   name="cancel_button"
+   top_delta="0"
+   width="65" />
+  <string
+  name="GroupBulkBan">
+    Group Ban
+  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
index 124c0596c3..ebb460deb0 100755
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -76,7 +76,7 @@
         Choose what Role to assign them to:
     </text>
     <combo_box
-     height="16"
+     height="20"
      layout="topleft"
      left_delta="0"
      name="role_name"
@@ -88,7 +88,7 @@
      label="Send Invitations"
      layout="topleft"
      left="4"
-     name="ok_button"
+     name="invite_button"
      top="356"
      width="135" />
     <button
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 2c835696ec..5a1d39969a 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -22,28 +22,6 @@
 
     <!-- separates the tab panel from the options underneath -->
 
-<!--
-
-    <layout_stack
-     name="group_roles_layout_stack"
-     top_pad="4"
-     right="-1"
-     height="420"
-     orientation="vertical"
-     follows="all"
-     layout="topleft">
-
-    <layout_panel
-     height="130"
-     right="-1"
-     min_height="124"
-     name="group_members_tab_layout_panel"
-     user_resize="true"
-     follows="all"
-     layout="topleft">
-
-//-->
-
     <tab_container
      name="roles_tab_container"
      left="0"
@@ -154,6 +132,15 @@ clicking on their names.
              follows="bottom|left"
              layout="topleft" />
 
+            <button
+             height="23"
+             label="Ban Member(s)"
+             follows="bottom|left"
+             left_pad="4"
+             name="member_ban"
+             width="100"
+             layout="topleft" />
+
             <button
              name="export_list"
              label="Export List"
@@ -344,7 +331,88 @@ things in this group. There&apos;s a broad variety of Abilities.
         </scroll_list>
         </panel>
 
-    </tab_container>
+    <panel
+     border="false"
+     height="303"
+     label="Banned Agents"
+     layout="topleft"
+     left="0"
+     right="-1"
+     help_topic="roles_banlist_tab"
+     name="banlist_sub_tab"
+     class="panel_group_banlist_subtab"
+     tool_tip="View the banned agents from this group."
+     width="310">
+      <panel.string
+       name="help_text">
+        Any resident on the ban list will be unable to join the group.
+      </panel.string>
+      <panel.string
+       name="ban_count_template">
+        Ban count: [COUNT]/[LIMIT]
+      </panel.string>
+      <name_list
+           column_padding="0"
+           draw_heading="true"
+           height="136"
+           follows="left|top|right"
+           layout="topleft"
+           left="0"
+           right="-1"
+           multi_select="true"
+           name="ban_list"
+           short_names="false"
+           top_pad="5">
+        <name_list.columns
+         label="Resident"
+         name="name"
+         font.name="SANSSERIF_SMALL"
+         font.style="NORMAL"
+         relative_width="0.7" />
+        <name_list.columns
+         label="Date Banned"
+         name="ban_date"
+         relative_width="0.3" />
+      </name_list>
+      <button
+        follows="top|left"
+        height="23"
+        label="Ban Resident(s)"
+        layout="topleft"
+        left="3"
+        name="ban_create"
+        tool_tip="Ban residents from your group"
+        width="120" />
+      <button
+        follows="top|left"
+        height="23"
+        label="Remove Ban(s)"
+        layout="topleft"
+        left_pad="5"
+        name="ban_delete"
+        tool_tip="Unban selected residents from your group"
+        width="120" />
+      <button
+        follows="top|left"
+        height="23"
+        width="23"
+        image_overlay="Refresh_Off"
+        layout="topleft"
+        left_pad="5"
+        name="ban_refresh"
+        tool_tip="Refresh the ban list"
+        />
+      <text
+        type="string"
+        height="18"
+        left_pad="5"
+        follows="top|left"
+        layout="topleft"
+        name="ban_count"
+        width="100">
+      </text>
+    </panel>
+  </tab_container>
 
 <!--    </layout_panel> -->
 
diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index 7a60bded1c..d160f64442 100755
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -9,7 +9,10 @@
 		<action description="Eject Members from this Group"
 		     longdescription="Eject Members from this Group using the &apos;Eject&apos; button in the Roles section &gt; Members tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability."
 		     name="member eject" value="2" />
-		<action
+    <action description="Manage ban list"
+         longdescription="Allows the group member to ban / un-ban Residents from this group."
+         name="allow ban" value="51" />
+    <action
 		     description="Toggle &apos;Open Enrollment&apos; and change &apos;Enrollment fee&apos;"
 		     longdescription="Toggle &apos;Open Enrollment&apos; to let new Members join without an invitation, and change the &apos;Enrollment fee&apos; in the General section."
 		     name="member options" value="3" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index be20a7f332..3ff68446a4 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2205,6 +2205,7 @@ If you continue to experience problems, please check your network and firewall s
   <string name="free">free</string>
 
   <!-- Group Profile roles and powers -->
+  <string name="Group Ban">Group Ban</string>
   <string name="Membership">Membership</string>
   <string name="Roles">Roles</string>
   <string name="Group Identity">Group Identity</string>

From 75c1b70f6e14fff3ff16322d7dc52698b156ac0c Mon Sep 17 00:00:00 2001
From: Jessica <none@none>
Date: Fri, 7 Nov 2014 00:47:58 -0500
Subject: [PATCH 078/229] Integrating Group Ban to Starlight skins

---
 .../starlight/xui/en/panel_group_roles.xml    | 88 +++++++++++++++++++
 .../starlightcui/xui/en/panel_group_roles.xml | 88 +++++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/indra/newview/skins/starlight/xui/en/panel_group_roles.xml b/indra/newview/skins/starlight/xui/en/panel_group_roles.xml
index a2d81217ec..991017338f 100644
--- a/indra/newview/skins/starlight/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_group_roles.xml
@@ -118,6 +118,13 @@ clicking on their names.
              left_pad="4"
              name="member_eject"
              width="100" />
+            <button
+             height="23"
+             label="Ban Member(s)"
+             follows="top|left"
+             left_pad="4"
+             name="member_ban"
+             width="100" />
             <button
              name="export_list"
              label="Export List"
@@ -288,6 +295,87 @@ things in this group. There&apos;s a broad variety of Abilities.
              width="270" />
         </scroll_list>
         </panel>
+        <panel
+        border="false"
+        height="303"
+        label="Banned Residents"
+        layout="topleft"
+        left="0"
+        right="-1"
+        help_topic="roles_banlist_tab"
+        name="banlist_sub_tab"
+        class="panel_group_banlist_subtab"
+        tool_tip="View the banned residents from this group."
+        width="310">
+        <panel.string
+         name="help_text">
+          Any resident on the ban list will be unable to join the group.
+        </panel.string>
+        <panel.string
+         name="ban_count_template">
+          Ban count: [COUNT]/[LIMIT]
+        </panel.string>
+        <name_list
+             column_padding="0"
+             draw_heading="true"
+             height="136"
+             follows="left|top|right"
+             layout="topleft"
+             left="0"
+             right="-1"
+             multi_select="true"
+             name="ban_list"
+             short_names="false"
+             top_pad="5">
+          <name_list.columns
+           label="Resident"
+           name="name"
+           font.name="SANSSERIF_SMALL"
+           font.style="NORMAL"
+           relative_width="0.7" />
+          <name_list.columns
+           label="Date Banned"
+           name="ban_date"
+           relative_width="0.3" />
+        </name_list>
+        <button
+          follows="top|left"
+          height="23"
+          label="Ban Resident(s)"
+          layout="topleft"
+          left="3"
+          name="ban_create"
+          tool_tip="Ban residents from your group"
+          width="120" />
+        <button
+          follows="top|left"
+          height="23"
+          label="Remove Ban(s)"
+          layout="topleft"
+          left_pad="5"
+          name="ban_delete"
+          tool_tip="Unban selected residents from your group"
+          width="120" />
+        <button
+          follows="top|left"
+          height="23"
+          width="23"
+          image_overlay="Refresh_Off"
+          layout="topleft"
+          left_pad="5"
+          name="ban_refresh"
+          tool_tip="Refresh the ban list"
+        />
+        <text
+          type="string"
+          height="18"
+          left_pad="5"
+          follows="top|left"
+          layout="topleft"
+          name="ban_count"
+          width="100">
+        </text>
+      </panel>
     </tab_container>
     <panel
      height="350"
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_group_roles.xml b/indra/newview/skins/starlightcui/xui/en/panel_group_roles.xml
index a2d81217ec..4d7347e0eb 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_group_roles.xml
@@ -118,6 +118,13 @@ clicking on their names.
              left_pad="4"
              name="member_eject"
              width="100" />
+            <button
+             height="23"
+             label="Ban Member(s)"
+             follows="top|left"
+             left_pad="4"
+             name="member_ban"
+             width="100" />
             <button
              name="export_list"
              label="Export List"
@@ -288,6 +295,87 @@ things in this group. There&apos;s a broad variety of Abilities.
              width="270" />
         </scroll_list>
         </panel>
+        <panel
+        border="false"
+        height="303"
+        label="Banned Residents"
+        layout="topleft"
+        left="0"
+        right="-1"
+        help_topic="roles_banlist_tab"
+        name="banlist_sub_tab"
+        class="panel_group_banlist_subtab"
+        tool_tip="View the banned residents from this group."
+        width="310">
+        <panel.string
+         name="help_text">
+          Any resident on the ban list will be unable to join the group.
+        </panel.string>
+        <panel.string
+         name="ban_count_template">
+          Ban count: [COUNT]/[LIMIT]
+        </panel.string>
+        <name_list
+             column_padding="0"
+             draw_heading="true"
+             height="136"
+             follows="left|top|right"
+             layout="topleft"
+             left="0"
+             right="-1"
+             multi_select="true"
+             name="ban_list"
+             short_names="false"
+             top_pad="5">
+          <name_list.columns
+           label="Resident"
+           name="name"
+           font.name="SANSSERIF_SMALL"
+           font.style="NORMAL"
+           relative_width="0.7" />
+          <name_list.columns
+           label="Date Banned"
+           name="ban_date"
+           relative_width="0.3" />
+        </name_list>
+        <button
+          follows="top|left"
+          height="23"
+          label="Ban Resident(s)"
+          layout="topleft"
+          left="3"
+          name="ban_create"
+          tool_tip="Ban residents from your group"
+          width="120" />
+        <button
+          follows="top|left"
+          height="23"
+          label="Remove Ban(s)"
+          layout="topleft"
+          left_pad="5"
+          name="ban_delete"
+          tool_tip="Unban selected residents from your group"
+          width="120" />
+        <button
+          follows="top|left"
+          height="23"
+          width="23"
+          image_overlay="Refresh_Off"
+          layout="topleft"
+          left_pad="5"
+          name="ban_refresh"
+          tool_tip="Refresh the ban list"
+        />
+        <text
+          type="string"
+          height="18"
+          left_pad="5"
+          follows="top|left"
+          layout="topleft"
+          name="ban_count"
+          width="100">
+        </text>
+    </panel>
     </tab_container>
     <panel
      height="350"

From 28c2808342d8ece3752065d6be18f111f9b6e323 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 7 Nov 2014 16:54:13 +0100
Subject: [PATCH 079/229] [Group Bans] Aaaaaaaaaaaaall the missing stuff...

---
 indra/newview/llpanelgroupbulk.cpp                        | 2 +-
 indra/newview/llpanelgroupinvite.cpp                      | 4 +++-
 indra/newview/llpanelgrouproles.cpp                       | 6 +++---
 indra/newview/skins/default/xui/da/panel_group_invite.xml | 2 +-
 indra/newview/skins/default/xui/de/panel_group_invite.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_group_roles.xml  | 4 ++--
 indra/newview/skins/default/xui/es/panel_group_invite.xml | 2 +-
 indra/newview/skins/default/xui/fr/panel_group_invite.xml | 2 +-
 indra/newview/skins/default/xui/it/panel_group_invite.xml | 2 +-
 indra/newview/skins/default/xui/ja/panel_group_invite.xml | 2 +-
 indra/newview/skins/default/xui/pl/panel_group_invite.xml | 2 +-
 indra/newview/skins/default/xui/pt/panel_group_invite.xml | 2 +-
 indra/newview/skins/default/xui/ru/panel_group_invite.xml | 2 +-
 indra/newview/skins/default/xui/tr/panel_group_invite.xml | 2 +-
 indra/newview/skins/default/xui/zh/panel_group_invite.xml | 2 +-
 15 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/indra/newview/llpanelgroupbulk.cpp b/indra/newview/llpanelgroupbulk.cpp
index 1eafc5bd64..76792cc6fd 100644
--- a/indra/newview/llpanelgroupbulk.cpp
+++ b/indra/newview/llpanelgroupbulk.cpp
@@ -387,7 +387,7 @@ void LLPanelGroupBulk::addUsers(uuid_vec_t& agent_ids)
 			} 
 			else 
 			{
-				llwarns << "llPanelGroupBulk: Selected avatar has no name: " << dest->getID() << llendl;
+				LL_WARNS() << "llPanelGroupBulk: Selected avatar has no name: " << dest->getID() << LL_ENDL;
 				names.push_back("(Unknown)");
 			}
 		}
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
index e662a05dfc..3227333e96 100755
--- a/indra/newview/llpanelgroupinvite.cpp
+++ b/indra/newview/llpanelgroupinvite.cpp
@@ -501,7 +501,9 @@ void LLPanelGroupInvite::addUsers(uuid_vec_t& agent_ids)
 			//looks like user try to invite offline friend
 			//for offline avatar_id gObjectList.findObject() will return null
 			//so we need to do this additional search in avatar tracker, see EXT-4732
-			if (LLAvatarTracker::instance().isBuddy(agent_id))
+			// <FS:Ansariel> FIRE-4140: Group invite button on profile sometimes doesn't work
+			//if (LLAvatarTracker::instance().isBuddy(agent_id))
+			// </FS:Ansariel>
 			{
 				LLAvatarName av_name;
 				if (!LLAvatarNameCache::get(agent_id, &av_name))
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index b3e3b9b535..d7832e591f 100755
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -2046,7 +2046,7 @@ bool LLPanelGroupRolesSubTab::needsApply(std::string& mesg)
 	LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
 	if(!gdatap)
 	{
-		llwarns << "Unable to get group data for group " << mGroupID << llendl;
+		LL_WARNS() << "Unable to get group data for group " << mGroupID << LL_ENDL;
 		return false;
 	}
 
@@ -2474,8 +2474,8 @@ void LLPanelGroupRolesSubTab::handleActionCheck(LLUICtrl* ctrl, bool force)
 		}
 		else
 		{
-			llwarns << "Unable to look up role information for role id: "
-				<< role_id << llendl;
+			LL_WARNS() << "Unable to look up role information for role id: "
+				<< role_id << LL_ENDL;
 		}
 		
 		//////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/skins/default/xui/da/panel_group_invite.xml b/indra/newview/skins/default/xui/da/panel_group_invite.xml
index 49daf6c9f2..b2ff285719 100755
--- a/indra/newview/skins/default/xui/da/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_invite.xml
@@ -19,7 +19,7 @@
 		Vælg hvilken rolle, du vil tildele dem:
 	</text>
 	<combo_box name="role_name" tool_tip="Vælg fra en liste med roller du har ret til at tildele medlemmer"/>
-	<button label="Send invitationer" name="ok_button"/>
+	<button label="Send invitationer" name="invite_button"/>
 	<button label="Annullér" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Gruppe invitation
diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml
index 2077c2e660..2c2d75d314 100755
--- a/indra/newview/skins/default/xui/de/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Wählen Sie eine Rolle aus:
 	</text>
 	<combo_box name="role_name" tool_tip="Wählen Sie aus der Liste der Rollen, die Sie an Mitglieder vergeben dürfen."/>
-	<button label="Einladungen versenden" name="ok_button"/>
+	<button label="Einladungen versenden" name="invite_button"/>
 	<button label="Abbr." name="cancel_button"/>
 	<string name="GroupInvitation">
 		Gruppeneinladung
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 5a1d39969a..393b9f6e67 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -334,14 +334,14 @@ things in this group. There&apos;s a broad variety of Abilities.
     <panel
      border="false"
      height="303"
-     label="Banned Agents"
+     label="Banned Residents"
      layout="topleft"
      left="0"
      right="-1"
      help_topic="roles_banlist_tab"
      name="banlist_sub_tab"
      class="panel_group_banlist_subtab"
-     tool_tip="View the banned agents from this group."
+     tool_tip="View the banned residents from this group."
      width="310">
       <panel.string
        name="help_text">
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
index 319e9d0f1b..d6c2ee7b8f 100755
--- a/indra/newview/skins/default/xui/es/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Elegir qué rol asignarles:
 	</text>
 	<combo_box name="role_name" tool_tip="Elige el rol de entre la lista de aquellos que estás autorizado a asignar"/>
-	<button label="Enviar las invitaciones" name="ok_button"/>
+	<button label="Enviar las invitaciones" name="invite_button"/>
 	<button label="Cancelar" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Invitar al grupo
diff --git a/indra/newview/skins/default/xui/fr/panel_group_invite.xml b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
index d792439220..d53af3167e 100755
--- a/indra/newview/skins/default/xui/fr/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Assignez-leur un rôle :
 	</text>
 	<combo_box name="role_name" tool_tip="Choisissez dans la liste de rôles que vous êtes autorisé(e) à attribuer aux membres"/>
-	<button label="Envoyer les invitations" name="ok_button"/>
+	<button label="Envoyer les invitations" name="invite_button"/>
 	<button label="Annuler" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Invitations au groupe
diff --git a/indra/newview/skins/default/xui/it/panel_group_invite.xml b/indra/newview/skins/default/xui/it/panel_group_invite.xml
index 1b57eba3f0..a3abcf5951 100755
--- a/indra/newview/skins/default/xui/it/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Scegli che ruolo assegnare loro:
 	</text>
 	<combo_box name="role_name" tool_tip="Scegli dall&apos;elenco dei ruoli ai quali ti è consentito assegnare i membri"/>
-	<button label="Manda gli inviti" name="ok_button"/>
+	<button label="Manda gli inviti" name="invite_button"/>
 	<button label="Annulla" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Invito di gruppo
diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
index cc9ebc405b..eb45fdba6a 100755
--- a/indra/newview/skins/default/xui/ja/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		割り当て先の役割を選択：
 	</text>
 	<combo_box name="role_name" tool_tip="メンバーに割り当てたい役割をリストから選んください"/>
-	<button label="招待を送信" name="ok_button"/>
+	<button label="招待を送信" name="invite_button"/>
 	<button label="取り消し" name="cancel_button"/>
 	<string name="GroupInvitation">
 		グループへの招待
diff --git a/indra/newview/skins/default/xui/pl/panel_group_invite.xml b/indra/newview/skins/default/xui/pl/panel_group_invite.xml
index 070a0c3283..2fed016579 100755
--- a/indra/newview/skins/default/xui/pl/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Wybierz funkcję dla nowej osoby:
 	</text>
 	<combo_box name="role_name" tool_tip="Wybierz z listy funkcje, które możesz przypisać osobom"/>
-	<button label="Wyślij zaproszenia" name="ok_button"/>
+	<button label="Wyślij zaproszenia" name="invite_button"/>
 	<button label="Anuluj" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Zaproszenie do grupy
diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
index de057481de..a1d4f60eb1 100755
--- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Escolha que Função atribuir a eles:
 	</text>
 	<combo_box name="role_name" tool_tip="Selecione o cargo da lista de cargos que você pode designar a membros"/>
-	<button label="Mandar convites" name="ok_button"/>
+	<button label="Mandar convites" name="invite_button"/>
 	<button label="Cancelar" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Convite
diff --git a/indra/newview/skins/default/xui/ru/panel_group_invite.xml b/indra/newview/skins/default/xui/ru/panel_group_invite.xml
index 68dac5cd7e..46424c168b 100755
--- a/indra/newview/skins/default/xui/ru/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Выберите назначаемую им роль:
 	</text>
 	<combo_box name="role_name" tool_tip="Выберите в списке роли, которые вы можете назначать участникам"/>
-	<button label="Отправить приглашения" name="ok_button"/>
+	<button label="Отправить приглашения" name="invite_button"/>
 	<button label="Отмена" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Групповое приглашение
diff --git a/indra/newview/skins/default/xui/tr/panel_group_invite.xml b/indra/newview/skins/default/xui/tr/panel_group_invite.xml
index 4ba5761edb..77c4db2cdc 100755
--- a/indra/newview/skins/default/xui/tr/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		Onları hala Role atayacağınızı seçin:
 	</text>
 	<combo_box name="role_name" tool_tip="Üyeleri atamanıza izin verilen Roller listesinden seçin"/>
-	<button label="Davetiye Gönder" name="ok_button"/>
+	<button label="Davetiye Gönder" name="invite_button"/>
 	<button label="İptal" name="cancel_button"/>
 	<string name="GroupInvitation">
 		Grup Davetiyesi
diff --git a/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
index 8921978b20..250bbaab6a 100755
--- a/indra/newview/skins/default/xui/zh/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
@@ -22,7 +22,7 @@
 		選擇指派給他們的角色：
 	</text>
 	<combo_box name="role_name" tool_tip="從角色清單選擇你有權指派給成員的角色："/>
-	<button label="送出邀請" name="ok_button"/>
+	<button label="送出邀請" name="invite_button"/>
 	<button label="取消" name="cancel_button"/>
 	<string name="GroupInvitation">
 		群組邀請

From e7466b0f06d62cf8f10e0fcf80c30928553b7ac7 Mon Sep 17 00:00:00 2001
From: Jessica <none@none>
Date: Fri, 7 Nov 2014 12:44:56 -0500
Subject: [PATCH 080/229] Mouse walk, run and fly by Siana of Singularity.

---
 indra/newview/lltoolfocus.cpp    | 38 ++++++++++++++++++++++++++++++--
 indra/newview/lltoolfocus.h      |  2 ++
 indra/newview/llviewerkeyboard.h |  2 +-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp
index a64d027818..7728454a33 100755
--- a/indra/newview/lltoolfocus.cpp
+++ b/indra/newview/lltoolfocus.cpp
@@ -39,6 +39,7 @@
 #include "llagentcamera.h"
 #include "llbutton.h"
 #include "llviewercontrol.h"
+#include "llviewerkeyboard.h"//<FS:JL> Mouse movement by Singularity
 #include "lldrawable.h"
 #include "lltooltip.h"
 #include "llhudmanager.h"
@@ -314,9 +315,15 @@ BOOL LLToolCamera::handleMouseUp(S32 x, S32 y, MASK mask)
 	return TRUE;
 }
 
+static bool right_hold_mouse_walk=false;//<FS:JL> Mouse movement by Singularity
 
 BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 {
+	if(right_hold_mouse_walk)//<FS:JL> Mouse movement by Singularity
+	{
+		agent_push_forward(KEYSTATE_LEVEL);
+	}//</FS:JL>
+	
 	S32 dx = gViewerWindow->getCurrentMouseDX();
 	S32 dy = gViewerWindow->getCurrentMouseDY();
 	
@@ -450,8 +457,35 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 	
 	return TRUE;
 }
-
-
+//<FS:JL> Mouse movement by Singularity
+BOOL LLToolCamera::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+	if(mMouseSteering)
+	{
+		agent_push_forward(KEYSTATE_DOWN);
+		right_hold_mouse_walk = true;
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+}
+
+BOOL LLToolCamera::handleRightMouseUp(S32 x, S32 y, MASK mask)
+{
+	if(mMouseSteering || right_hold_mouse_walk)
+	{
+	agent_push_forward(KEYSTATE_UP);
+	right_hold_mouse_walk = false;
+	return TRUE;
+	}
+	else
+	{
+	return FALSE;
+	}
+}
+//</FS:JL>
 void LLToolCamera::onMouseCaptureLost()
 {
 	releaseMouse();
diff --git a/indra/newview/lltoolfocus.h b/indra/newview/lltoolfocus.h
index b1ac42e33f..4eafd1ff60 100755
--- a/indra/newview/lltoolfocus.h
+++ b/indra/newview/lltoolfocus.h
@@ -41,6 +41,8 @@ public:
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
+	virtual BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);//<FS:JL> Mouse movement by Singularity
+	virtual BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask);//<FS:JL> Mouse movement by Singularity
 
 	virtual void	onMouseCaptureLost();
 
diff --git a/indra/newview/llviewerkeyboard.h b/indra/newview/llviewerkeyboard.h
index ca73212ed1..40802702be 100755
--- a/indra/newview/llviewerkeyboard.h
+++ b/indra/newview/llviewerkeyboard.h
@@ -113,5 +113,5 @@ private:
 };
 
 extern LLViewerKeyboard gViewerKeyboard;
-
+void agent_push_forward(EKeystate s);//<FS:JL> Mouse movement by Singularity
 #endif // LL_LLVIEWERKEYBOARD_H

From 8484b613a8b68fce31e55110c8a56c4f511f592a Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 7 Nov 2014 19:29:00 +0100
Subject: [PATCH 081/229] [Group Bans] Fix Baker's NameListCtrl un-fix
 introduced with group bans

---
 indra/newview/llnamelistctrl.cpp              | 64 ++++++++++---------
 indra/newview/llnamelistctrl.h                | 18 +++---
 indra/newview/llpanelgrouproles.cpp           | 21 +++---
 indra/newview/llpanelgrouproles.h             |  3 +-
 .../default/xui/en/panel_group_roles.xml      |  1 +
 .../starlight/xui/en/panel_group_roles.xml    |  1 +
 .../starlightcui/xui/en/panel_group_roles.xml |  1 +
 7 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index 29d5440fa1..4f9befff8d 100755
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -64,8 +64,9 @@ LLNameListCtrl::LLNameListCtrl(const LLNameListCtrl::Params& p)
 	mNameColumnIndex(p.name_column.column_index),
 	mNameColumn(p.name_column.column_name),
 	mAllowCallingCardDrop(p.allow_calling_card_drop),
-	mShortNames(p.short_names),
-	mPendingLookupsRemaining(0)
+	mShortNames(p.short_names)
+	// <FS:Ansariel> Fix Baker's NameListCtrl un-fix
+	//mPendingLookupsRemaining(0)
 {}
 
 // public
@@ -355,16 +356,18 @@ LLScrollListItem* LLNameListCtrl::addNameItemRow(
 				mAvatarNameCacheConnections[id] = LLAvatarNameCache::get(id,boost::bind(&LLNameListCtrl::onAvatarNameCache,this, _1, _2, suffix, item->getHandle()));
 				// </FS:Ansariel>
 
-				if(mPendingLookupsRemaining <= 0)
-				{
-					// BAKER TODO:
-					// We might get into a state where mPendingLookupsRemaining might
-					//	go negative.  So just reset it right now and figure out if it's
-					//	possible later :)
-					mPendingLookupsRemaining = 0;
-					mNameListCompleteSignal(false);
-				}
-				mPendingLookupsRemaining++;
+				// <FS:Ansariel> Fix Baker's NameListCtrl un-fix
+				//if(mPendingLookupsRemaining <= 0)
+				//{
+				//	// BAKER TODO:
+				//	// We might get into a state where mPendingLookupsRemaining might
+				//	//	go negative.  So just reset it right now and figure out if it's
+				//	//	possible later :)
+				//	mPendingLookupsRemaining = 0;
+				//	mNameListCompleteSignal(false);
+				//}
+				//mPendingLookupsRemaining++;
+				// </FS:Ansariel>
 			}
 			break;
 		}
@@ -417,7 +420,8 @@ void LLNameListCtrl::removeNameItem(const LLUUID& agent_id)
 		selectNthItem(idx); // not sure whether this is needed, taken from previous implementation
 		deleteSingleItem(idx);
 
-		mPendingLookupsRemaining--;
+		// <FS:Ansariel> Fix Baker's NameListCtrl un-fix
+		//mPendingLookupsRemaining--;
 	}
 }
 
@@ -466,22 +470,24 @@ void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id,
 		}
 	}
 	
-	//////////////////////////////////////////////////////////////////////////
-	// BAKER - FIX NameListCtrl
- 	//if (mPendingLookupsRemaining <= 0)
- 	{
- 		// We might get into a state where mPendingLookupsRemaining might
- 		//	go negative.  So just reset it right now and figure out if it's
- 		//	possible later :)
- 		//mPendingLookupsRemaining = 0;
-		
- 		mNameListCompleteSignal(true);
- 	}
- 	//else
- 	{
- 	//	mPendingLookupsRemaining--;
- 	}
-	//////////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////////////
+	//// BAKER - FIX NameListCtrl
+// <FS:Ansariel> Fix Baker's NameListCtrl un-fix
+ //	//if (mPendingLookupsRemaining <= 0)
+ //	{
+ //		// We might get into a state where mPendingLookupsRemaining might
+ //		//	go negative.  So just reset it right now and figure out if it's
+ //		//	possible later :)
+ //		//mPendingLookupsRemaining = 0;
+	//	
+ //		mNameListCompleteSignal(true);
+ //	}
+ //	//else
+ //	{
+ //	//	mPendingLookupsRemaining--;
+ //	}
+// </FS:Ansariel>
+	////////////////////////////////////////////////////////////////////////////
 
 	dirtyColumns();
 }
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index c332f2b967..ec059bcf55 100755
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -185,14 +185,16 @@ private:
 	avatar_name_cache_connection_map_t mAvatarNameCacheConnections;
 	// </FS:Ansariel>
 
-	S32 mPendingLookupsRemaining;
-	namelist_complete_signal_t mNameListCompleteSignal;
-	
-public:
-	boost::signals2::connection setOnNameListCompleteCallback(boost::function<void(bool)> onNameListCompleteCallback) 
-	{ 
-		return mNameListCompleteSignal.connect(onNameListCompleteCallback); 
-	}
+// <FS:Ansariel> Fix Baker's NameListCtrl un-fix
+//	S32 mPendingLookupsRemaining;
+//	namelist_complete_signal_t mNameListCompleteSignal;
+//	
+//public:
+//	boost::signals2::connection setOnNameListCompleteCallback(boost::function<void(bool)> onNameListCompleteCallback) 
+//	{ 
+//		return mNameListCompleteSignal.connect(onNameListCompleteCallback); 
+//	}
+// </FS:Ansariel>
 
 };
 
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index d7832e591f..0e3d492265 100755
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -2971,7 +2971,8 @@ BOOL LLPanelGroupBanListSubTab::postBuildSubTab(LLView* root)
 
 	setBanCount(0);
 
-	mBanList->setOnNameListCompleteCallback(boost::bind(&LLPanelGroupBanListSubTab::onBanListCompleted, this, _1));
+	// <FS:Ansariel> Fix Baker's NameListCtrl un-fix
+	//mBanList->setOnNameListCompleteCallback(boost::bind(&LLPanelGroupBanListSubTab::onBanListCompleted, this, _1));
 	
 	populateBanList();
 
@@ -3138,14 +3139,16 @@ void LLPanelGroupBanListSubTab::handleRefreshBanList()
 	LLGroupMgr::getInstance()->sendGroupBanRequest(LLGroupMgr::REQUEST_GET, mGroupID);
 }
 
-void LLPanelGroupBanListSubTab::onBanListCompleted(bool isComplete)
-{
-	if(isComplete)
-	{
-		mRefreshBanListButton->setEnabled(TRUE);
-		populateBanList();
-	}
-}
+// <FS:Ansariel> Fix Baker's NameListCtrl un-fix
+//void LLPanelGroupBanListSubTab::onBanListCompleted(bool isComplete)
+//{
+//	if(isComplete)
+//	{
+//		mRefreshBanListButton->setEnabled(TRUE);
+//		populateBanList();
+//	}
+//}
+// </FS:Ansariel>
 
 void LLPanelGroupBanListSubTab::setBanCount(U32 ban_count)
 {
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h
index e8c0ab82ea..a174b00657 100755
--- a/indra/newview/llpanelgrouproles.h
+++ b/indra/newview/llpanelgrouproles.h
@@ -355,7 +355,8 @@ public:
 	static void onRefreshBanList(void* user_data);
 	void handleRefreshBanList();
 
-	void onBanListCompleted(bool isComplete);
+	// <FS:Ansariel> Fix Baker's NameListCtrl un-fix
+	//void onBanListCompleted(bool isComplete);
 
 protected:
 	void setBanCount(U32 ban_count);
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 393b9f6e67..a4247aa5d4 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -362,6 +362,7 @@ things in this group. There&apos;s a broad variety of Abilities.
            multi_select="true"
            name="ban_list"
            short_names="false"
+           name_column="name"
            top_pad="5">
         <name_list.columns
          label="Resident"
diff --git a/indra/newview/skins/starlight/xui/en/panel_group_roles.xml b/indra/newview/skins/starlight/xui/en/panel_group_roles.xml
index 991017338f..55d3fc12bb 100644
--- a/indra/newview/skins/starlight/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_group_roles.xml
@@ -326,6 +326,7 @@ things in this group. There&apos;s a broad variety of Abilities.
              multi_select="true"
              name="ban_list"
              short_names="false"
+             name_column="name"
              top_pad="5">
           <name_list.columns
            label="Resident"
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_group_roles.xml b/indra/newview/skins/starlightcui/xui/en/panel_group_roles.xml
index 4d7347e0eb..41bbd9ba58 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_group_roles.xml
@@ -326,6 +326,7 @@ things in this group. There&apos;s a broad variety of Abilities.
              multi_select="true"
              name="ban_list"
              short_names="false"
+             name_column="name"
              top_pad="5">
           <name_list.columns
            label="Resident"

From 89c9d5c562e10b9c17f6f2359d3e9fe550ee3e07 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 7 Nov 2014 19:42:16 +0100
Subject: [PATCH 082/229] [Group Bans] Restore FIRE-13501: Activate "Members"
 tab by default

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

diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 0e3d492265..ee9a2c2a34 100755
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -433,7 +433,10 @@ void LLPanelGroupRoles::setGroupID(const LLUUID& id)
 		button->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_MEMBER_VISIBLE_IN_DIR));
 	// [/FS:CR]
 	if(mSubTabContainer)
-		mSubTabContainer->selectTab(1);
+		// <FS:Ansariel> FIRE-13501: Activate "Members" tab by default
+		//mSubTabContainer->selectTab(1);
+		mSubTabContainer->selectTab(0);
+		// </FS:Ansariel>
 	group_roles_tab->mFirstOpen = TRUE;
 	activate();
 }

From 5b6f5be3f16544d0ffe2ce48e575b95949845401 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 7 Nov 2014 19:43:13 +0100
Subject: [PATCH 083/229] Fix EOL

---
 indra/newview/lltoolfocus.cpp | 58 +++++++++++++++++------------------
 indra/newview/lltoolfocus.h   |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp
index 7728454a33..0c13155857 100755
--- a/indra/newview/lltoolfocus.cpp
+++ b/indra/newview/lltoolfocus.cpp
@@ -319,9 +319,9 @@ static bool right_hold_mouse_walk=false;//<FS:JL> Mouse movement by Singularity
 
 BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 {
-	if(right_hold_mouse_walk)//<FS:JL> Mouse movement by Singularity
-	{
-		agent_push_forward(KEYSTATE_LEVEL);
+	if(right_hold_mouse_walk)//<FS:JL> Mouse movement by Singularity
+	{
+		agent_push_forward(KEYSTATE_LEVEL);
 	}//</FS:JL>
 	
 	S32 dx = gViewerWindow->getCurrentMouseDX();
@@ -458,32 +458,32 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 	return TRUE;
 }
 //<FS:JL> Mouse movement by Singularity
-BOOL LLToolCamera::handleRightMouseDown(S32 x, S32 y, MASK mask)
-{
-	if(mMouseSteering)
-	{
-		agent_push_forward(KEYSTATE_DOWN);
-		right_hold_mouse_walk = true;
-		return TRUE;
-	}
-	else
-	{
-		return FALSE;
-	}
-}
-
-BOOL LLToolCamera::handleRightMouseUp(S32 x, S32 y, MASK mask)
-{
-	if(mMouseSteering || right_hold_mouse_walk)
-	{
-	agent_push_forward(KEYSTATE_UP);
-	right_hold_mouse_walk = false;
-	return TRUE;
-	}
-	else
-	{
-	return FALSE;
-	}
+BOOL LLToolCamera::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+	if(mMouseSteering)
+	{
+		agent_push_forward(KEYSTATE_DOWN);
+		right_hold_mouse_walk = true;
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+}
+
+BOOL LLToolCamera::handleRightMouseUp(S32 x, S32 y, MASK mask)
+{
+	if(mMouseSteering || right_hold_mouse_walk)
+	{
+	agent_push_forward(KEYSTATE_UP);
+	right_hold_mouse_walk = false;
+	return TRUE;
+	}
+	else
+	{
+	return FALSE;
+	}
 }
 //</FS:JL>
 void LLToolCamera::onMouseCaptureLost()
diff --git a/indra/newview/lltoolfocus.h b/indra/newview/lltoolfocus.h
index 4eafd1ff60..d88606cc09 100755
--- a/indra/newview/lltoolfocus.h
+++ b/indra/newview/lltoolfocus.h
@@ -41,7 +41,7 @@ public:
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);//<FS:JL> Mouse movement by Singularity
+	virtual BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);//<FS:JL> Mouse movement by Singularity
 	virtual BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask);//<FS:JL> Mouse movement by Singularity
 
 	virtual void	onMouseCaptureLost();

From 320806a0f97a2a324fd2cc1f2b0719e6b4755c57 Mon Sep 17 00:00:00 2001
From: Tank_Master <tank.master@phoenixviewer.com>
Date: Mon, 3 Nov 2014 17:17:32 -0800
Subject: [PATCH 084/229] =?UTF-8?q?Rename=20=E2=80=9CBanned=20Agents?=
 =?UTF-8?q?=E2=80=9D=20to=20=E2=80=9CBanned=20Residents=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 indra/newview/llfloaterregioninfo.cpp | 2 +-
 indra/newview/llgroupmgr.cpp          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index b5573806e7..5c2cf70245 100755
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -2922,7 +2922,7 @@ bool LLDispatchSetEstateAccess::operator()(
 	if (num_banned_agents > 0
 		&& !(access_flags & ESTATE_ACCESS_BANNED_AGENTS))
 	{
-		LL_WARNS() << "non-zero count for banned agents, but no corresponding flag" << LL_ENDL;
+		LL_WARNS() << "non-zero count for banned residents, but no corresponding flag" << LL_ENDL;
 	}
 	if (num_estate_managers > 0
 		&& !(access_flags & ESTATE_ACCESS_MANAGERS))
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 58a069ab16..7cd5e9e74b 100755
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1954,7 +1954,7 @@ void LLGroupMgr::sendGroupBanRequest(	EBanRequestType request_type,
 
 	LLSD body = LLSD::emptyMap();
 	body["ban_action"]  = (LLSD::Integer)(ban_action & ~BAN_UPDATE);
-	// Add our list of potential banned agents to the list
+	// Add our list of potential banned residents to the list
 	body["ban_ids"]	= LLSD::emptyArray();
 	LLSD ban_entry;
 

From 7b2d7c5bec8321781208d6d78b3691c577981fb6 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Fri, 7 Nov 2014 20:06:04 +0100
Subject: [PATCH 085/229] Updated Polish translation (Group Bans)

---
 .../skins/default/xui/pl/notifications.xml    | 16 +++++++
 .../default/xui/pl/panel_group_bulk_ban.xml   | 43 +++++++++++++++++++
 .../default/xui/pl/panel_group_roles.xml      | 16 +++++++
 .../skins/default/xui/pl/role_actions.xml     |  1 +
 .../newview/skins/default/xui/pl/strings.xml  |  3 ++
 .../starlight/xui/pl/panel_group_roles.xml    | 16 +++++++
 .../starlightcui/xui/pl/panel_group_roles.xml | 16 +++++++
 7 files changed, 111 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/pl/panel_group_bulk_ban.xml

diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 0a6f958fe2..695f8db468 100755
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -167,6 +167,22 @@ Udzielaj tego przywileju z rozwagą.
 Dodać ten przywilej do funkcji &apos;[ROLE_NAME]&apos;?
 		<usetemplate name="okcancelbuttons" notext="Nie" yestext="Tak"/>
 	</notification>
+	<notification name="AssignBanAbilityWarning">
+		Dodajesz przywilej &apos;[ACTION_NAME]&apos; do funkcji &apos;[ROLE_NAME]&apos;
+
+*UWAGA*
+Osoba w funkcji z tym przywilejem otrzyma również &apos;[ACTION_NAME_2]&apos; oraz &apos;[ACTION_NAME_3]&apos;
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="RemoveBanAbilityWarning">
+		Zabierasz przywilej &apos;[ACTION_NAME]&apos; z funkcji &apos;[ROLE_NAME]&apos;
+
+*UWAGA*
+Zabranie tej funkcji NIE usunie &apos;[ACTION_NAME_2]&apos; oraz &apos;[ACTION_NAME_3]&apos;.
+
+Jeśli nie chcesz, aby te przywileje były dłużej przypisane do tej roli, to wyłącz je natychmiast!
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="EjectGroupMemberWarning">
 		Zamierzasz wyrzucić [AVATAR_NAME] z grupy.
 		<usetemplate ignoretext="Potwierdź wyrzucenie osoby z grupy" name="okcancelignore" notext="Anuluj" yestext="Wyrzuć"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_bulk_ban.xml b/indra/newview/skins/default/xui/pl/panel_group_bulk_ban.xml
new file mode 100644
index 0000000000..2030c5d79d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_group_bulk_ban.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Banowanie Rezydentów" name="bulk_ban_panel">
+	<panel.string name="loading">
+		(wczytywanie...)
+	</panel.string>
+	<panel.string name="ban_selection_too_large">
+		Bany grupowe nie zostały wysłane: zaznaczono zbyt wielu Rezydentów. Limit to 100 na jedno żądanie.
+	</panel.string>
+	<panel.string name="ban_not_permitted">
+		Bany grupowe nie zostały wysłane: nie masz przywileju zarządzania listą banów.
+	</panel.string>
+	<panel.string name="ban_limit_fail">
+		Bany grupowe nie zostały wysłane: Twoja grupa osiągnęła ich limit.
+	</panel.string>
+	<panel.string name="partial_ban">
+		Niektóre bany grupowe nie zostały wysłane:
+[REASONS]
+	</panel.string>
+	<panel.string name="ban_failed">
+		Bany grupowe nie zostały wysłane:
+[REASONS]
+	</panel.string>
+	<panel.string name="residents_already_banned">
+		- Następujące osoby są już zbanowane: [RESIDENTS].
+	</panel.string>
+	<panel.string name="ban_limit_reached">
+		- Osiągnięto limit banów, następujące osoby nie zostały zbanowane: [RESIDENTS].
+	</panel.string>
+	<panel.string name="cant_ban_yourself">
+		- Nie możesz zbanować samego/samej siebie.
+	</panel.string>
+	<text name="help_text">
+		Możesz wybrać wielu Rezydentów do zbanowania z Twojej grupy. Kliknij na &apos;Wybierz osoby&apos;, aby rozpocząć
+	</text>
+	<button label="Wybierz osoby" name="add_button" />
+	<name_list name="banned_agent_list" tool_tip="Przytrzymaj klawisz Ctrl i klikaj na imionach Rezydentów, aby wybrać wiele pozycji" />
+	<button label="Usuń wybrane z listy" name="remove_button" tool_tip="Usuń wybranych powyżej Rezydentów z listy zbanowanych" />
+	<button label="Banuj Rezydentów" name="ban_button" />
+	<button label="Anuluj" name="cancel_button" />
+	<string name="GroupBulkBan">
+		Bany grupowe
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_roles.xml b/indra/newview/skins/default/xui/pl/panel_group_roles.xml
index a9bd83c0fb..ec7a414d58 100755
--- a/indra/newview/skins/default/xui/pl/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_roles.xml
@@ -20,6 +20,7 @@ Możesz wybrać wiele osób naciskając Ctrl i klikając na ich imionach.
 			</name_list>
 			<button label="Zaproś do grupy" name="member_invite"/>
 			<button label="Usuń z grupy" name="member_eject"/>
+			<button label="Zbanuj" name="member_ban"/>
 			<button name="export_list" label="Eksport listy"/>
 		</panel>
 		<panel label="Funkcje" name="roles_sub_tab" tool_tip="Funkcje">
@@ -48,6 +49,21 @@ na wykonywanie różnych zadań. Istnieje wiele przywilejów.
 			<filter_editor label="Filtruj przywileje" name="filter_input"/>
 			<scroll_list name="action_list" tool_tip="Wybierz przywilej aby zobaczyć szczegóły"/>
 		</panel>
+		<panel label="Zbanowani" name="banlist_sub_tab" tool_tip="Zobacz, jakie osoby są zbanowane w tej grupie.">
+			<panel.string name="help_text">
+				Jeśli rezydent znajduje się na liście banów, to nie będzie w stanie dołączyć do grupy.
+			</panel.string>
+			<panel.string name="ban_count_template">
+				Bany: [COUNT]/[LIMIT]
+			</panel.string>
+			<name_list name="ban_list">
+				<name_list.columns label="Rezydent" name="name"/>
+				<name_list.columns label="Zbanowano" name="ban_date"/>
+			</name_list>
+			<button label="Dodaj bana" name="ban_create" tool_tip="Zbanuj Rezydentów z Twojej grupy"/>
+			<button label="Usuń bana" name="ban_delete" tool_tip="Odbanuj zaznaczonych Rezydentów w Twojej grupie"/>
+			<button name="ban_refresh" tool_tip="Odśwież listę banów"/>
+		</panel>
 	</tab_container>
 	<panel name="members_footer">
 		<text name="assigned_roles_label">
diff --git a/indra/newview/skins/default/xui/pl/role_actions.xml b/indra/newview/skins/default/xui/pl/role_actions.xml
index 1f73cd989c..3e670c780d 100755
--- a/indra/newview/skins/default/xui/pl/role_actions.xml
+++ b/indra/newview/skins/default/xui/pl/role_actions.xml
@@ -3,6 +3,7 @@
 	<action_set description="Przywileje pozwalające na dodawanie i usuwanie osób z grupy oraz umożliwiające nowym osobom na przyłączanie bez zaproszenia." name="Membership">
 		<action description="Zapraszanie do grupy" longdescription="Zapraszanie nowych ludzi do grupy używając przycisku &apos;Zaproś&apos; w sekcji Funkcje &gt; Osoby" name="member invite"/>
 		<action description="Usuwanie z grupy" longdescription="Usuwanie osób z grupy za pomocą przycisku &apos;Usuń z Grupy&apos; w sekcji Funkcje &gt; Osoby. Właściciel może usunąć każdego za wyjątkiem innego Właściciela. Jeżeli nie jesteś Właścicielem możesz usuwać osoby wtedy (i tylko wtedy), gdy są w funkcji Każdy i nie mają aktywnej ŻADNEJ innej. Aby odebrać osobie funkcję musisz mieć przywilej &apos;Odbieranie Funkcji&apos;." name="member eject"/>
+		<action description="Zarządzanie listą banów" longdescription="Umożliwia banowanie / odbanowywanie w tej grupie." name="allow ban"/>
 		<action description="Dostęp do opcji &apos;Wolny Wstęp&apos; i zmiany &apos;Opłaty Wstępnej&apos;" longdescription="Dostęp do opcji &apos;Wolny Wstęp&apos; (pozwala nowym osobom na przyłączanie bez zaproszenia) i zmiany &apos;Opłaty Wstępnej&apos; w Ustawieniach Grupy w sekcji Ogólne." name="member options"/>
 	</action_set>
 	<action_set description="Przywileje pozwalające na dodawanie, usuwanie i edycję funkcji w grupie, na nadawanie i odbieranie funkcji osobom w grupie oraz na przypisywanie Przywilejów do Funkcji." name="Roles">
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index c60bb543c0..4d3413a767 100755
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -4570,6 +4570,9 @@ Jeśli problemy będą występowały nadal, proszę sprawdź sieć i ustawienia
 	<string name="free">
 		darmowe
 	</string>
+	<string name="Group Ban">
+		Bany grupowe
+	</string>
 	<string name="Membership">
 		Członkostwo
 	</string>
diff --git a/indra/newview/skins/starlight/xui/pl/panel_group_roles.xml b/indra/newview/skins/starlight/xui/pl/panel_group_roles.xml
index 0ee529c3ab..fd8728d0be 100644
--- a/indra/newview/skins/starlight/xui/pl/panel_group_roles.xml
+++ b/indra/newview/skins/starlight/xui/pl/panel_group_roles.xml
@@ -20,6 +20,7 @@ Możesz wybrać wiele osób naciskając Ctrl i klikając na ich imionach.
 			</name_list>
 			<button label="Zaproś do grupy" name="member_invite"/>
 			<button label="Usuń z grupy" name="member_eject"/>
+			<button label="Zbanuj" name="member_ban"/>
 			<button name="export_list" label="Eksport listy"/>
 		</panel>
 		<panel label="FUNKCJE" name="roles_sub_tab">
@@ -48,6 +49,21 @@ na wykonywanie różnych zadań. Istnieje wiele przywilejów.
 			<filter_editor label="Filtruj przywileje" name="filter_input"/>
 			<scroll_list name="action_list" tool_tip="Wybierz przywilej aby zobaczyć szczegóły"/>
 		</panel>
+		<panel label="ZBANOWANI" name="banlist_sub_tab" tool_tip="Zobacz, jakie osoby są zbanowane w tej grupie.">
+			<panel.string name="help_text">
+				Jeśli rezydent znajduje się na liście banów, to nie będzie w stanie dołączyć do grupy.
+			</panel.string>
+			<panel.string name="ban_count_template">
+				Bany: [COUNT]/[LIMIT]
+			</panel.string>
+			<name_list name="ban_list">
+				<name_list.columns label="Rezydent" name="name"/>
+				<name_list.columns label="Zbanowano" name="ban_date"/>
+			</name_list>
+			<button label="Dodaj bana" name="ban_create" tool_tip="Zbanuj Rezydentów z Twojej grupy"/>
+			<button label="Usuń bana" name="ban_delete" tool_tip="Odbanuj zaznaczonych Rezydentów w Twojej grupie"/>
+			<button name="ban_refresh" tool_tip="Odśwież listę banów"/>
+		</panel>
 	</tab_container>
 	<panel name="members_footer">
 		<text name="static">
diff --git a/indra/newview/skins/starlightcui/xui/pl/panel_group_roles.xml b/indra/newview/skins/starlightcui/xui/pl/panel_group_roles.xml
index 0ee529c3ab..fd8728d0be 100644
--- a/indra/newview/skins/starlightcui/xui/pl/panel_group_roles.xml
+++ b/indra/newview/skins/starlightcui/xui/pl/panel_group_roles.xml
@@ -20,6 +20,7 @@ Możesz wybrać wiele osób naciskając Ctrl i klikając na ich imionach.
 			</name_list>
 			<button label="Zaproś do grupy" name="member_invite"/>
 			<button label="Usuń z grupy" name="member_eject"/>
+			<button label="Zbanuj" name="member_ban"/>
 			<button name="export_list" label="Eksport listy"/>
 		</panel>
 		<panel label="FUNKCJE" name="roles_sub_tab">
@@ -48,6 +49,21 @@ na wykonywanie różnych zadań. Istnieje wiele przywilejów.
 			<filter_editor label="Filtruj przywileje" name="filter_input"/>
 			<scroll_list name="action_list" tool_tip="Wybierz przywilej aby zobaczyć szczegóły"/>
 		</panel>
+		<panel label="ZBANOWANI" name="banlist_sub_tab" tool_tip="Zobacz, jakie osoby są zbanowane w tej grupie.">
+			<panel.string name="help_text">
+				Jeśli rezydent znajduje się na liście banów, to nie będzie w stanie dołączyć do grupy.
+			</panel.string>
+			<panel.string name="ban_count_template">
+				Bany: [COUNT]/[LIMIT]
+			</panel.string>
+			<name_list name="ban_list">
+				<name_list.columns label="Rezydent" name="name"/>
+				<name_list.columns label="Zbanowano" name="ban_date"/>
+			</name_list>
+			<button label="Dodaj bana" name="ban_create" tool_tip="Zbanuj Rezydentów z Twojej grupy"/>
+			<button label="Usuń bana" name="ban_delete" tool_tip="Odbanuj zaznaczonych Rezydentów w Twojej grupie"/>
+			<button name="ban_refresh" tool_tip="Odśwież listę banów"/>
+		</panel>
 	</tab_container>
 	<panel name="members_footer">
 		<text name="static">

From ae980188b2868324c45ddb107eebe9f7b1934e89 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 7 Nov 2014 20:57:26 +0100
Subject: [PATCH 086/229] [Group Bans] German translation

---
 .../skins/default/xui/de/notifications.xml    | 24 +++++++++++
 .../default/xui/de/panel_group_bulk_ban.xml   | 43 +++++++++++++++++++
 .../default/xui/de/panel_group_roles.xml      | 17 ++++++++
 .../skins/default/xui/de/role_actions.xml     |  1 +
 .../newview/skins/default/xui/de/strings.xml  |  3 ++
 5 files changed, 88 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/de/panel_group_bulk_ban.xml

diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 30bc30ffc1..a302732003 100755
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -216,6 +216,22 @@ Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
 Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
 		<usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/>
 	</notification>
+	<notification name="AssignBanAbilityWarning">
+		Sie sind im Begriff, der Rolle „[ROLE_NAME]“ die Fähigkeit „[ACTION_NAME]“ zuzuweisen.
+
+*ACHTUNG*
+Jedes Mitglied in einer Rolle mit dieser Fähigkeit bekommt ebenfalls die Fähigkeiten „[ACTION_NAME_2]“ und „[ACTION_NAME_3]“ zugewiesen.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="RemoveBanAbilityWarning">
+		Sie sind im Begriff, der Rolle „[ROLE_NAME]“ die Fähigkeit „[ACTION_NAME]“ zu entziehen.
+
+*ACHTUNG*
+Der Entzug dieser Fähigkeit entzieht NICHT die Fähigkeiten „[ACTION_NAME_2]“ und „[ACTION_NAME_3]“.
+
+Falls diese Fähigkeiten dieser Rolle nicht länger zugewiesen sein sollen, deaktivieren Sie diese unverzüglich!
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="EjectGroupMemberWarning">
 		Sie sind dabei, [AVATAR_NAME] aus der Gruppe hinauszuwerfen.
 		<usetemplate ignoretext="Hinauswerfen eines einzelnen Gruppenmitglieds bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Hinauswerfen"/>
@@ -1604,6 +1620,14 @@ Diese Gruppe verlassen?
 		Sie können die Gruppe nicht verlassen, da Sie der letzte Besitzer der Gruppe sind. Weisen Sie die Besitzerrolle zuerst einem anderen Mitglied zu.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="GroupDepartError">
+		Verlassen der Gruppe nicht möglich: [reason]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="GroupDepart">
+		Sie haben die Gruppe [group_name] verlassen.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmKick">
 		Möchten Sie WIRKLICH alle Benutzer aus dem Grid werfen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Alle Benutzer hinauswerfen"/>
diff --git a/indra/newview/skins/default/xui/de/panel_group_bulk_ban.xml b/indra/newview/skins/default/xui/de/panel_group_bulk_ban.xml
new file mode 100644
index 0000000000..2ed3566481
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_group_bulk_ban.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Einwohner verbannen" name="bulk_ban_panel">
+	<panel.string name="loading">
+		(wird geladen...)
+	</panel.string>
+	<panel.string name="ban_selection_too_large">
+		Gruppen-Bann nicht gesendet: Zu viele Einwohner ausgewählt. Gruppen-Banns sind limitiert auf 100 pro Anfrage.
+	</panel.string>
+	<panel.string name="ban_not_permitted">
+		Gruppen-Bann nicht gesendet: Sie verfügen nicht über die Fähigkeit „Bannliste verwalten“
+	</panel.string>
+	<panel.string name="ban_limit_fail">
+		Gruppen-Bann nicht gesendet: Ihre Gruppe hat das Limit an möglichen Gruppen-Banns erreicht.
+	</panel.string>
+	<panel.string name="partial_ban">
+		Einige Gruppen-Banns wurden nicht gesendet:
+[REASONS]
+	</panel.string>
+	<panel.string name="ban_failed">
+		Gruppen-Banns wurden nicht gesendet:
+[REASONS]
+	</panel.string>
+	<panel.string name="residents_already_banned">
+		- Die folgenden Einwohner waren bereits gebannt: [RESIDENTS].
+	</panel.string>
+	<panel.string name="ban_limit_reached">
+		- Bann-Limit erreicht; Folgende Einwohner wurden nicht gebannt: [RESIDENTS].
+	</panel.string>
+	<panel.string name="cant_ban_yourself">
+		- Sie können sich nicht selbst aus einer Gruppe verbannen.
+	</panel.string>
+	<text name="help_text">
+		Zum Verbannen mehrerer Einwohner auf „Einwohnerauswahl öffnen“ klicken.
+	</text>
+	<button label="Einwohnerauswahl öffnen" name="add_button"/>
+	<name_list name="banned_agent_list" tool_tip="Drücken Sie die STRG-Taste und klicken Sie auf die Namen der Einwohner, um mehrere auszuwählen."/>
+	<button label="Ausgewählte von Liste entfernen" name="remove_button" tool_tip="Entfernt die oben ausgewählten Einwohner von der Liste"/>
+	<button label="Einwohner verbannen" name="ban_button" />
+	<button label="Abbr." name="cancel_button" />
+	<string name="GroupBulkBan">
+		Gruppen-Bann
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml
index a338158f9f..858981b0cc 100755
--- a/indra/newview/skins/default/xui/de/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml
@@ -25,6 +25,7 @@ um mehrere Mitglieder auszuwählen.
 			</name_list>
 			<button label="Einladen" name="member_invite"/>
 			<button label="Hinauswerfen" name="member_eject"/>
+			<button label="Verbannen" name="member_ban"/>
 			<button label="Liste exportieren" name="export_list"/>
 		</panel>
 		<panel label="Rollen" name="roles_sub_tab" tool_tip="Rollen">
@@ -65,6 +66,22 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
 				<scroll_list.columns label="" name="action"/>
 			</scroll_list>
 		</panel>
+		<panel label="Verbannte Einwohner" name="banlist_sub_tab" tool_tip="Verbannte Einwohner dieser Gruppe anzeigen.">
+			<panel.string name="help_text">
+				Für jeden Einwohner auf der Liste ist es unmöglich, der Gruppe beizutreten.
+			</panel.string>
+			<panel.string name="ban_count_template">
+				Bann-Anzahl: [COUNT]/[LIMIT]
+			</panel.string>
+			<name_list name="ban_list">
+				<name_list.columns label="Einwohner" name="name"/>
+				<name_list.columns label="Bann-Datum" name="ban_date"/>
+			</name_list>
+			<button label="Verbannen" name="ban_create" tool_tip="Einwohner aus der Gruppe verbannen"/>
+			<button label="Bann entfernen" name="ban_delete" tool_tip="Verbannung der ausgewählten Einwohner aufheben"/>
+			<button name="ban_refresh" tool_tip="Bannliste aktualisieren"/>
+			<text name="ban_count" width="150"></text>
+		</panel>
 	</tab_container>
 	<panel name="members_footer">
 		<text name="assigned_roles_label">
diff --git a/indra/newview/skins/default/xui/de/role_actions.xml b/indra/newview/skins/default/xui/de/role_actions.xml
index 6a3d4d1944..e26405cd6d 100755
--- a/indra/newview/skins/default/xui/de/role_actions.xml
+++ b/indra/newview/skins/default/xui/de/role_actions.xml
@@ -3,6 +3,7 @@
 	<action_set description="Diese Fähigkeiten ermöglichen das Hinzufügen und Entfernen von Mitgliedern sowie den Beitritt ohne Einladung." name="Membership">
 		<action description="Personen in diese Gruppe einladen" longdescription="Leute in diese Gruppe mit der Schaltfläche „Einladen“ im Abschnitt „Rollen“ &gt; Registerkarte „Mitglieder“ in die Gruppe einladen." name="member invite" value="1"/>
 		<action description="Mitglieder aus dieser Gruppe werfen" longdescription="Leute aus dieser Gruppe mit der Schaltfläche „Hinauswerfen“ im Abschnitt „Rollen“ &gt; Registerkarte „Mitglieder“ aus der Gruppe werfen. Ein Eigentümer kann jeden, außer einen anderen Eigentümer, ausschließen. Wenn Sie kein Eigentümer sind, können Sie ein Mitglied nur dann aus der Gruppe werfen, wenn es die Rolle Jeder inne hat, jedoch KEINE andere Rolle. Um Mitgliedern Rollen entziehen zu können, müssen Sie über die Fähigkeit „Mitgliedern Rollen entziehen“ verfügen." name="member eject" value="2"/>
+		<action description="Bannliste verwalten" longdescription="Erlaubt es dem Mitglied andere Einwohner aus der Gruppe zu verbannen bzw. den Bann aufzuheben." name="allow ban" value="51"/>
 		<action description="„Registrierung offen“ aktivieren/deaktivieren und „Beitrittsgebühr“ ändern." longdescription="„Registrierung offen“ aktivieren, um damit neue Mitglieder ohne Einladung beitreten können, und die „Beitrittsgebühr“ im Abschnitt „Allgemein“ ändern." name="member options" value="3"/>
 	</action_set>
 	<action_set description="Diese Fähigkeiten ermöglichen das Hinzufügen, Entfernen und Ändern von Gruppenrollen, das Zuweisen und Entfernen von Rollen und das Zuweisen von Fähigkeiten zu Rollen." name="Roles">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index f26ff82582..75ccef29de 100755
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -4756,6 +4756,9 @@ Falls der Fehler weiterhin auftritt, überprüfen Sie bitte Ihre Netzwerk- und F
 		 kostenlos
 	</string>
 <!--  /FS:AW opensim currency support -->
+	<string name="Group Ban">
+		Gruppen-Bann
+	</string>
 	<string name="Membership">
 		Mitgliedschaft
 	</string>

From 521b6197919a5ca4b1f8b713a37d38643a7b1823 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Fri, 7 Nov 2014 22:54:42 +0100
Subject: [PATCH 087/229] Polish translation tune-up

---
 .../newview/skins/default/xui/pl/floater_land_holdings.xml  | 5 ++---
 .../newview/skins/default/xui/pl/floater_live_lsleditor.xml | 1 -
 .../newview/skins/default/xui/pl/floater_media_settings.xml | 1 -
 indra/newview/skins/default/xui/pl/floater_mem_leaking.xml  | 2 --
 indra/newview/skins/default/xui/pl/floater_mute_object.xml  | 3 +--
 .../newview/skins/default/xui/pl/floater_outgoing_call.xml  | 6 +++---
 indra/newview/skins/default/xui/pl/floater_preferences.xml  | 1 -
 .../skins/default/xui/pl/floater_preview_texture.xml        | 1 -
 indra/newview/skins/default/xui/pl/floater_select_key.xml   | 2 +-
 indra/newview/skins/default/xui/pl/floater_sell_land.xml    | 5 +----
 .../newview/skins/default/xui/pl/floater_sound_preview.xml  | 2 +-
 indra/newview/skins/default/xui/pl/floater_stats.xml        | 1 -
 12 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml
index ea93780f42..8361746c91 100755
--- a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="land holdings floater" title="Moja działka">
+<floater name="land holdings floater" title="Moje działki">
 	<scroll_list name="parcel list">
 		<column label="Działka" name="name"/>
-		<column label="Region" name="location"/>
 		<column label="Typ" name="type"/>
 		<column label="Obszar" name="area"/>
 	</scroll_list>
 	<button label="Teleportuj" label_selected="Teleportuj" name="Teleport" tool_tip="Teleportuj się do centrum tej działki."/>
 	<button label="Mapa" label_selected="Mapa" name="Show on Map" tool_tip="Pokaż to miejsce na mapie świata."/>
 	<text name="contrib_label">
-		Kontrybucje do Twoich Grup:
+		Kontrybucje do Twoich grup:
 	</text>
 	<scroll_list name="grant list">
 		<column label="Grupa" name="group"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
index 3330582b74..c33a501a5e 100755
--- a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
@@ -11,5 +11,4 @@
 	</floater.string>
 	<button label="Zresetuj" label_selected="Zresetuj" name="Reset"/>
 	<check_box label="Włączony" name="running"/>
-	<check_box label="Mono" name="mono"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_media_settings.xml b/indra/newview/skins/default/xui/pl/floater_media_settings.xml
index 6529a8a9a1..7e1e72f0c1 100755
--- a/indra/newview/skins/default/xui/pl/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/pl/floater_media_settings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="media_settings" title="Ustawienia mediów">
-	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
 	<button label="Zastosuj" label_selected="Zastosuj" name="Apply"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
index c2897a1789..71a79bc34d 100755
--- a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
@@ -5,8 +5,6 @@
 	<text name="total_leaked_label">
 		Wyciekło: [SIZE] KB
 	</text>
-	<button label="Start" name="start_btn"/>
-	<button label="Stop" name="stop_btn"/>
 	<button label="Uwolnij" name="release_btn"/>
 	<button label="Zamknij" name="close_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_mute_object.xml b/indra/newview/skins/default/xui/pl/floater_mute_object.xml
index 8ced0140c1..97c80e312f 100755
--- a/indra/newview/skins/default/xui/pl/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/pl/floater_mute_object.xml
@@ -7,8 +7,7 @@
 		Nazwa obiektu
 	</line_editor>
 	<text name="note">
-		* blokuje jedynie tekst obiektu, nie dźwięk
+		* Blokuje jedynie tekst obiektu, nie dźwięk
 	</text>
-	<button label="OK" name="OK"/>
 	<button label="Anuluj" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml
index 37e01e7cee..b04afeff7d 100755
--- a/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml
@@ -22,13 +22,13 @@
 		Brak odpowiedzi. Proszę spróbować później.
 	</text>
 	<text name="nearby">
-		Zostałeś/aś rozłączony/a z [VOICE_CHANNEL_NAME].  [RECONNECT_NEARBY]
+		Zostałeś/aś rozłączony/a z [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY]
 	</text>
 	<text name="nearby_P2P_by_other">
-		Twoja rozmowa została zakończona.  [RECONNECT_NEARBY]
+		Twoja rozmowa została zakończona. [RECONNECT_NEARBY]
 	</text>
 	<text name="nearby_P2P_by_agent">
-		Zakończyłeś/aś rozmowę.  [RECONNECT_NEARBY]
+		Zakończyłeś/aś rozmowę. [RECONNECT_NEARBY]
 	</text>
 	<text name="leaving">
 		Opuszczanie: [CURRENT_CHAT].
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences.xml b/indra/newview/skins/default/xui/pl/floater_preferences.xml
index 85cec9d018..ffe56f6111 100755
--- a/indra/newview/skins/default/xui/pl/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preferences.xml
@@ -4,7 +4,6 @@
 		Zmiana po logowaniu
 	</floater.string>
 	<button label="Zastosuj" label_selected="Zastosuj" name="Apply"/>
-	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
 	<search_editor label="Szukaj w ustawieniach" name="search_prefs_edit" tool_tip="Wprowadź w tym miejscu interesującą Cię frazę. Wyniki będą wyświetlane dla pasujących fragmentów nazw lub komentarzy przypisanych do ustawień." />
 	<tab_container name="pref core">
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml
index 5fa80b9323..003fd89044 100755
--- a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml
@@ -24,7 +24,6 @@
 		<combo_box name="combo_aspect_ratio" tool_tip="Wyświetl w stałych proporcjach"/>
 	</panel>
 	<panel name="button_panel">
-		<button label="OK" name="Keep"/>
 		<button label="Wyrzuć" name="Discard"/>
 		<flyout_button label="Zapisz..." name="save_tex_btn">
 			<flyout_button.item label="Zapisz jako TGA" name="save_item_tga"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_select_key.xml b/indra/newview/skins/default/xui/pl/floater_select_key.xml
index 975f29d059..52d4e3816c 100755
--- a/indra/newview/skins/default/xui/pl/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/pl/floater_select_key.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container">
-	<button label="Anuluj" name="Cancel"/>
+	<button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
 	<text name="Save item as:">
 		Naciśnij przycisk, aby ustawić przełącznik Głosu.
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_sell_land.xml b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
index bf59e43471..dce1792c1d 100755
--- a/indra/newview/skins/default/xui/pl/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
@@ -5,9 +5,6 @@
 			<text name="info_parcel_label">
 				Działka:
 			</text>
-			<text name="info_parcel">
-				NAZWA DZIAŁKI
-			</text>
 			<text name="info_size_label">
 				Rozmiar:
 			</text>
@@ -35,7 +32,7 @@
 				<combo_box.item label="Wybrany Kupiec:" name="Specificuser:"/>
 			</combo_box>
 			<button label="Wybierz" name="sell_to_select_agent"/>
-			<text name="sell_objects_label" font="SansSerifSmall">
+			<text name="sell_objects_label">
 				3. Sprzedać obiekty razem z działką?
 			</text>
 			<text name="sell_objects_text">
diff --git a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
index c97670fafb..7db92e6b17 100755
--- a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
@@ -7,5 +7,5 @@
 		Opis:
 	</text>
 	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
-	<button label="Załaduj ([AMOUNT]L$)" label_selected="Załaduj ([AMOUNT]L$)" name="ok_btn"/>
+	<button label="Załaduj ([AMOUNT]L$)" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_stats.xml b/indra/newview/skins/default/xui/pl/floater_stats.xml
index 98504e4d78..2300d6364f 100755
--- a/indra/newview/skins/default/xui/pl/floater_stats.xml
+++ b/indra/newview/skins/default/xui/pl/floater_stats.xml
@@ -31,7 +31,6 @@
 					<stat_bar label="Pamięć przypisana" name="glboundmemstat"/>
 				</stat_view>
 				<stat_view name="memory" label="Użycie pamięci">
-					<stat_bar name="LLTrace" label="LLTrace"/>
 					<stat_bar name="LLView" label="Interfejs"/>
 					<stat_bar name="LLFontFreetype" label="Czcionki"/>
 					<stat_bar name="LLInventoryObject" label="Szafa"/>

From e33bc147c842ce6c28a2c43c73034b558b8db301 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sat, 8 Nov 2014 02:28:51 +0100
Subject: [PATCH 088/229] Polish translation update for group bans yet again...
 fighting with unfriendly text wrapping

---
 indra/newview/skins/default/xui/pl/panel_group_bulk_ban.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/pl/panel_group_bulk_ban.xml b/indra/newview/skins/default/xui/pl/panel_group_bulk_ban.xml
index 2030c5d79d..4688631f50 100644
--- a/indra/newview/skins/default/xui/pl/panel_group_bulk_ban.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_bulk_ban.xml
@@ -30,7 +30,7 @@
 		- Nie możesz zbanować samego/samej siebie.
 	</panel.string>
 	<text name="help_text">
-		Możesz wybrać wielu Rezydentów do zbanowania z Twojej grupy. Kliknij na &apos;Wybierz osoby&apos;, aby rozpocząć
+		Możesz wybrać wielu Rezydentów do zbanowania z grupy. Kliknij na &apos;Wybierz osoby&apos;, aby rozpocząć.
 	</text>
 	<button label="Wybierz osoby" name="add_button" />
 	<name_list name="banned_agent_list" tool_tip="Przytrzymaj klawisz Ctrl i klikaj na imionach Rezydentów, aby wybrać wiele pozycji" />

From a46ce4268c3c09025ccfecdbc4f9909d107df484 Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Sat, 8 Nov 2014 02:57:12 +0100
Subject: [PATCH 089/229] FIRE-14896 - Don't allow creating AO sets that
 contain non-ASCII characters.

---
 indra/newview/ao.cpp                                 | 8 ++++++--
 indra/newview/skins/default/xui/en/notifications.xml | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/indra/newview/ao.cpp b/indra/newview/ao.cpp
index 5e2ce21785..5907b27683 100644
--- a/indra/newview/ao.cpp
+++ b/indra/newview/ao.cpp
@@ -445,13 +445,17 @@ BOOL FloaterAO::newSetCallback(const LLSD& notification,const LLSD& response)
 
 	LLStringUtil::trim(newSetName);
 
+	LLUIString new_set_name=newSetName;
+
 	if(newSetName.empty())
+	{
 		return FALSE;
-	else if(newSetName.find_first_of(":|")!=std::string::npos)
+	}
+	else if(!LLTextValidate::validateASCIIPrintableNoPipe(new_set_name.getWString()))
 	{
 		LLSD args;
 		args["AO_SET_NAME"]=newSetName;
-		LLNotificationsUtil::add("NewAOCantContainColon",args);
+		LLNotificationsUtil::add("NewAOCantContainNonASCII",args);
 		return FALSE;
 	}
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5fba3b50d9..319925fe13 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9188,7 +9188,7 @@ Reset WL settings for &apos;[PARCEL_NAME]&apos; to region default?
    name="NewAOSet"
    type="alertmodal">
 Specify a name for the new AO set:
-(The name may not contain a ":" or "|" character)
+(The name may contain any ASCII character, except for ":" or "|")
     <form name="form">
       <input name="message" type="text" default="true">
 New AO Set
@@ -9207,10 +9207,10 @@ New AO Set
 
   <notification
    icon="alertmodal.tga"
-   name="NewAOCantContainColon"
+   name="NewAOCantContainNonASCII"
    type="alertmodal">
 Could not create new AO set "[AO_SET_NAME]".
-The name may not contain ":" or "|" characters.
+The name may only contain ASCII characters, excluding ":" and "|".
     <usetemplate
      name="okbutton"
      yestext="OK"/>

From 7600a2de925d4a8917d9f6ba094710af1810de79 Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Sat, 8 Nov 2014 03:46:32 +0100
Subject: [PATCH 090/229] FIRE-14896 - Don't allow renaming AO sets that
 contain non-ASCII characters - Fix creating name validation.

---
 indra/newview/ao.cpp                                 | 12 +++++++++---
 indra/newview/skins/default/xui/en/notifications.xml |  6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/indra/newview/ao.cpp b/indra/newview/ao.cpp
index 5907b27683..91cf8b8f30 100644
--- a/indra/newview/ao.cpp
+++ b/indra/newview/ao.cpp
@@ -342,9 +342,13 @@ void FloaterAO::onRenameSet()
 	std::string name=mSetSelector->getSimple();
 	LLStringUtil::trim(name);
 
+	LLUIString new_set_name=name;
+
 	if(!name.empty())
 	{
-		if(name.find_first_of(":|")==std::string::npos)
+		if(
+			LLTextValidate::validateASCIIPrintableNoPipe(new_set_name.getWString()) &&	// only allow ASCII
+			name.find_first_of(":|")==std::string::npos)								// don't allow : or |
 		{
 			if(AOEngine::instance().renameSet(mSelectedSet,name))
 			{
@@ -356,7 +360,7 @@ void FloaterAO::onRenameSet()
 		{
 			LLSD args;
 			args["AO_SET_NAME"]=name;
-			LLNotificationsUtil::add("RenameAOCantContainColon",args);
+			LLNotificationsUtil::add("RenameAOMustBeASCII",args);
 		}
 	}
 	mSetSelector->setSimple(mSelectedSet->getName());
@@ -451,7 +455,9 @@ BOOL FloaterAO::newSetCallback(const LLSD& notification,const LLSD& response)
 	{
 		return FALSE;
 	}
-	else if(!LLTextValidate::validateASCIIPrintableNoPipe(new_set_name.getWString()))
+	else if(
+		!LLTextValidate::validateASCIIPrintableNoPipe(new_set_name.getWString()) ||		// only allow ASCII
+		newSetName.find_first_of(":|")!=std::string::npos)								// don't allow : or |
 	{
 		LLSD args;
 		args["AO_SET_NAME"]=newSetName;
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 319925fe13..4db9087533 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9218,10 +9218,10 @@ The name may only contain ASCII characters, excluding ":" and "|".
 
   <notification
    icon="alertmodal.tga"
-   name="RenameAOCantContainColon"
+   name="RenameAOMustBeASCII"
    type="alertmodal">
-Could not rename new AO set to "[AO_SET_NAME]".
-The name may not contain ":" or "|" characters.
+Could not rename AO set "[AO_SET_NAME]".
+The name may only contain ASCII characters, excluding ":" and "|".
     <usetemplate
      name="okbutton"
      yestext="OK"/>

From be19c42f0554c93c0d5fd55e45ccfe431737766e Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 8 Nov 2014 11:09:04 +0100
Subject: [PATCH 091/229] FIRE-14896: Updated German translation

---
 .../newview/skins/default/xui/de/notifications.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index a302732003..cc5c5cfe82 100755
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -4213,7 +4213,7 @@ Wählen Sie ein kleineres Stück Land aus.
 	</notification>
 
   <notification name="FSWL" label="Windlight-Umgebungseinstellungen anpassen">
-&apos;[PARCEL_NAME]&apos;, im Besitz von [OWNER_NAME], möchte deine visuellen Windlight-Umgebungseinstellungen ändern.
+„[PARCEL_NAME]“, im Besitz von [OWNER_NAME], möchte deine visuellen Windlight-Umgebungseinstellungen ändern.
     <form name="form">
       <button name="Allow" text="Zulassen"/>
       <button name="Ignore" text="Ignorieren"/>
@@ -4221,14 +4221,14 @@ Wählen Sie ein kleineres Stück Land aus.
   </notification>
   
   <notification name="FSWLClear" label="Windlight-Umgebungseinstellungen zurücksetzen">
-Windlight-Umgebungseinstellungen für &apos;[PARCEL_NAME]&apos; auf Regionsstandard zurücksetzen?
+Windlight-Umgebungseinstellungen für „[PARCEL_NAME]“ auf Regionsstandard zurücksetzen?
     <usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Ja"/>
   </notification>
 	
 <!-- ## Zi: Animation Overrider -->
   <notification name="NewAOSet">
 Bitte einen Namen für das neue Animationsset eingeben:
-(Der Name darf kein ":" oder "|" enthalten)
+(Der Name darf ausschließlich ASCII-Zeichen ausgenommen „:“ und „|“ enhalten.)
     <form name="form">
       <input name="message">
 Neues Animationsset
@@ -4242,17 +4242,17 @@ Neues Animationsset
     </form>
   </notification>
 
-  <notification name="NewAOCantContainColon">
+  <notification name="NewAOCantContainNonASCII">
 Ein neues Animationsset mit Namen "[AO_SET_NAME]" konnte nicht angelegt werden.
-Der Name darf kein ":" oder "|" enhalten.
+Der Name darf ausschließlich ASCII-Zeichen ausgenommen „:“ und „|“ enhalten.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
   </notification>
 
-  <notification name="RenameAOCantContainColon">
+  <notification name="RenameAOMustBeASCII">
 Das Animationsset konnte nicht zu "[AO_SET_NAME]" umbenannt werden.
-Der Name darf kein ":" oder "|" enhalten.
+Der Name darf ausschließlich ASCII-Zeichen ausgenommen „:“ und „|“ enhalten.
     <usetemplate
      name="okbutton"
      yestext="OK"/>

From 64bcf85ed05c10c5b790073580380d855c07ab35 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sat, 8 Nov 2014 12:22:06 +0100
Subject: [PATCH 092/229] FIRE-14896: Updated Polish translation

---
 indra/newview/skins/default/xui/pl/notifications.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 695f8db468..05b03d28ad 100755
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -3578,7 +3578,7 @@ W innym przypadku możesz poszukać na mapie miejsc oznaczonych jako &quot;Infoh
 	</notification>
 	<notification name="NewAOSet">
 		Wpisz nazwę nowego zestawu AO:
-(Nazwa nie może zawierać ":" lub "|")
+(Nazwa może zawierać każdy znak ASCII, za wyjątkiem ":" oraz "|")
 		<form name="form">
 			<input name="message">
 				Nowy zestaw AO
@@ -3587,14 +3587,14 @@ W innym przypadku możesz poszukać na mapie miejsc oznaczonych jako &quot;Infoh
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
-	<notification name="NewAOCantContainColon">
+	<notification name="NewAOCantContainNonASCII">
 		Nie można utworzyć zestawu AO o nazwie "[AO_SET_NAME]".
-Nazwa nie może zawierać ":" lub "|".
+Nazwa może zawierać tylko znaki ASCII, za wyjątkiem ":" oraz "|".
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RenameAOCantContainColon">
-		Nie można zmienić nazwy zestawu AO na "[AO_SET_NAME]".
-Nazwa nie może zawierać ":" lub "|".
+	<notification name="RenameAOMustBeASCII">
+		Nie można zmienić nazwy zestawu AO "[AO_SET_NAME]".
+Nazwa może zawierać tylko znaki ASCII, za wyjątkiem ":" oraz "|".
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RemoveAOSet">

From 7e28e89f490f99fae2b454c86077ddde61cc07f5 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sat, 8 Nov 2014 18:10:40 +0100
Subject: [PATCH 093/229] Tip to default branch.

---
 README_BUILD_FIRESTORM_MACOSX.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README_BUILD_FIRESTORM_MACOSX.txt b/README_BUILD_FIRESTORM_MACOSX.txt
index 529bba70d5..0d7d57e6b1 100755
--- a/README_BUILD_FIRESTORM_MACOSX.txt
+++ b/README_BUILD_FIRESTORM_MACOSX.txt
@@ -32,9 +32,9 @@ build, using openjpeg instead of KDU.
 
 Available premade firestorm-specific build targets:
 
-	ReleaseFS		(includes KDU, FMOD)
-	ReleaseFS_open		(no KDU, no FMOD)
-	RelWithDebInfo_open	(no KDU, no FMOD)
+	ReleaseFS (includes KDU, FMOD)
+	ReleaseFS_open (no KDU, no FMOD)
+	RelWithDebInfo_open (no KDU, no FMOD)
 
 To build firestorm:
 

From 1025de37084fc2bd734f03c8d70d3c0260ddb25c Mon Sep 17 00:00:00 2001
From: "kadah.coba@gmail.com" <kadah.coba@gmail.com>
Date: Sat, 8 Nov 2014 16:54:02 -0800
Subject: [PATCH 094/229] Fix: FSLatencyOneTimeFixRun should be persistent

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e0f052e60d..d2b657ee90 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -22803,7 +22803,7 @@ Change of this parameter will affect the layout of buttons in notification toast
         <key>Comment</key>
         <string>One time fix has run for this install for script dialog colors on Latency</string>
         <key>Persist</key>
-        <integer>0</integer>
+        <integer>1</integer>
         <key>HideFromEditor</key>
         <integer>1</integer>
         <key>Type</key>

From d8a121ecf2fad7d4d796e1b4dd206f7d36461554 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Mon, 10 Nov 2014 01:42:39 +0100
Subject: [PATCH 095/229] Polish translation tune-up

---
 .../skins/default/xui/pl/floater_tools.xml    | 18 ++++++++++--------
 .../default/xui/pl/floater_top_objects.xml    |  2 +-
 .../default/xui/pl/floater_url_entry.xml      |  1 -
 .../default/xui/pl/floater_voice_effect.xml   |  1 -
 .../xui/pl/floater_whitelist_entry.xml        |  3 +--
 .../skins/default/xui/pl/inspect_object.xml   |  2 +-
 .../default/xui/pl/language_settings.xml      | 19 -------------------
 .../skins/default/xui/pl/menu_avatar_self.xml |  2 +-
 .../default/xui/pl/menu_cof_body_part.xml     |  1 +
 .../skins/default/xui/pl/menu_inventory.xml   |  8 ++++----
 .../default/xui/pl/menu_inventory_add.xml     |  2 +-
 .../xui/pl/menu_inventory_gear_default.xml    |  4 ++--
 .../skins/default/xui/pl/menu_navbar.xml      |  1 -
 .../skins/default/xui/pl/menu_outfit_gear.xml |  2 +-
 .../skins/default/xui/pl/menu_picks.xml       |  1 -
 .../skins/default/xui/pl/menu_topinfobar.xml  |  1 -
 .../xui/pl/menu_wearable_list_item.xml        |  4 +++-
 .../skins/default/xui/pl/mime_types.xml       | 11 +++--------
 .../skins/default/xui/pl/mime_types_mac.xml   | 14 +++++++-------
 19 files changed, 36 insertions(+), 61 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index bba889529d..fc42bfc7ea 100755
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -102,7 +102,6 @@
 	<button name="ToolHemiCone" tool_tip="Półstożek"/>
 	<button name="ToolSphere" tool_tip="Kula"/>
 	<button name="ToolHemiSphere" tool_tip="Półkula"/>
-	<button name="ToolTorus" tool_tip="Torus"/>
 	<button name="ToolTube" tool_tip="Rura"/>
 	<button name="ToolRing" tool_tip="Pierścień"/>
 	<button name="ToolTree" tool_tip="Drzewo"/>
@@ -296,7 +295,6 @@
 				<combo_box.item label="Walec" name="Cylinder"/>
 				<combo_box.item label="Graniastosłup" name="Prism"/>
 				<combo_box.item label="Kula" name="Sphere"/>
-				<combo_box.item label="Torus" name="Torus"/>
 				<combo_box.item label="Rura" name="Tube"/>
 				<combo_box.item label="Pierścień" name="Ring"/>
 				<combo_box.item label="Skulpt" name="Sculpted"/>
@@ -377,15 +375,20 @@
 			</text>
 			<combo_box name="sculpt type control" tool_tip="Opcja &quot;żadne&quot; została usunięta, ponieważ działa identycznie jak &quot;Płaszczyzna&quot;.">
 				<combo_box.item label="Kula" name="Sphere"/>
-				<combo_box.item label="Torus" name="Torus"/>
 				<combo_box.item label="Płaszczyzna / Żadne" name="Plane"/>
 				<combo_box.item label="Walec" name="Cylinder"/>
 			</combo_box>
 		</panel>
 		<panel label="Cechy" name="Features">
-			<panel.string name="None">Żadny</panel.string>
-			<panel.string name="Prim">Prima</panel.string>
-			<panel.string name="Convex Hull">Powłoka wypukła</panel.string>
+			<panel.string name="None">
+				Żadny
+			</panel.string>
+			<panel.string name="Prim">
+				Prima
+			</panel.string>
+			<panel.string name="Convex Hull">
+				Powłoka wypukła
+			</panel.string>
 			<text name="select_single">
 				Wybierz pojedynczy obiekt, aby edytować cechy.
 			</text>
@@ -411,12 +414,11 @@
 			<spinner label="Obniż. siły" name="Light Falloff"/>
 			<spinner label="Nastrój" name="Light Ambiance"/>
 			<text name="label physicsshapetype">
-				Typ kształtu Fizycznego:
+				Typ kształtu fizycznego:
 			</text>
 			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="Wybierz typ kształtu fizycznego"/>
 			<combo_box name="material">
 				<combo_box.item label="Kamień" name="Stone"/>
-				<combo_box.item label="Metal" name="Metal"/>
 				<combo_box.item label="Szkło" name="Glass"/>
 				<combo_box.item label="Drewno" name="Wood"/>
 				<combo_box.item label="Ciało" name="Flesh"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_top_objects.xml b/indra/newview/skins/default/xui/pl/floater_top_objects.xml
index 81222b0ab5..021de2d10c 100755
--- a/indra/newview/skins/default/xui/pl/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/pl/floater_top_objects.xml
@@ -37,7 +37,7 @@
 	<text name="id_text">
 		ID obiektu:
 	</text>
-	<button label="Pokaż emitery" name="show_beacon_btn"/>
+	<button label="Pokaż emiter" name="show_beacon_btn"/>
 	<text name="obj_name_text">
 		Nazwa obiektu:
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_url_entry.xml b/indra/newview/skins/default/xui/pl/floater_url_entry.xml
index 1eeff933cf..02e31fa9d8 100755
--- a/indra/newview/skins/default/xui/pl/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/pl/floater_url_entry.xml
@@ -3,7 +3,6 @@
 	<text name="media_label">
 		URL Mediów:
 	</text>
-	<button label="OK" name="ok_btn" />
 	<button label="Anuluj" name="cancel_btn" />
 	<button label="Wyczyść" name="clear_btn" />
 	<text name="loading_label">
diff --git a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml b/indra/newview/skins/default/xui/pl/floater_voice_effect.xml
index 68680edbc1..074b3d09ff 100755
--- a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pl/floater_voice_effect.xml
@@ -42,7 +42,6 @@
 		Nagraj próbkę, a następnie kliknij na głos aby usłyszeć jego brzmienie.
 	</text>
 	<button label="Nagraj" name="record_btn" tool_tip="Nagraj próbkę swojego głosu."/>
-	<button label="Zatrzymaj" name="record_stop_btn"/>
 	<text name="voice_morphing_link">
 		[[URL] Subskrybuj teraz]
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml
index fe872ae221..7146baedc3 100755
--- a/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml
@@ -3,7 +3,6 @@
 	<text name="media_label">
 		Wprowadź URL / wzorzec dla dodania do listy dozwolonych domen
 	</text>
-	<line_editor name="whitelist_entry" tool_tip="Wprowadź URL lub wzorzec URL do Białej Listy"/>
-	<button label="OK" name="ok_btn"/>
+	<line_editor name="whitelist_entry" tool_tip="Wprowadź URL lub wzorzec URL na Białą Listę"/>
 	<button label="Anuluj" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/inspect_object.xml b/indra/newview/skins/default/xui/pl/inspect_object.xml
index e3b1366e7d..86f317b3f2 100755
--- a/indra/newview/skins/default/xui/pl/inspect_object.xml
+++ b/indra/newview/skins/default/xui/pl/inspect_object.xml
@@ -19,7 +19,7 @@ Właściciel [OWNER]
 	<string name="Sit">
 		Usiądź tutaj
 	</string>
-	<icon name="secure_browsing" tool_tip="Zabezpiecz przeglądanie"/>
+	<icon name="secure_browsing" tool_tip="Bezpieczne przeglądanie (Secured Browsing)"/>
 	<button label="Kup" name="buy_btn"/>
 	<button label="Zapłać" name="pay_btn"/>
 	<button label="Weź kopię" name="take_free_copy_btn"/>
diff --git a/indra/newview/skins/default/xui/pl/language_settings.xml b/indra/newview/skins/default/xui/pl/language_settings.xml
index 78c1d9465b..98273be186 100755
--- a/indra/newview/skins/default/xui/pl/language_settings.xml
+++ b/indra/newview/skins/default/xui/pl/language_settings.xml
@@ -4,25 +4,6 @@
 	<string name="MacLocale">pl_PL.UTF-8</string>
 	<string name="DarwinLocale">pl_PL.UTF-8</string>
 	<string name="LinuxLocale">pl_PL.UTF-8</string>
-	<!-- 
-	datetimeToCodes["wkday"]	= "%a";		// Thu
-	datetimeToCodes["weekday"]	= "%A";		// Thursday
-	datetimeToCodes["year4"]	= "%Y";		// 2009
-	datetimeToCodes["year"]		= "%Y";		// 2009
-	datetimeToCodes["year2"]	= "%y";		// 09
-	datetimeToCodes["mth"]		= "%b";		// Aug
-	datetimeToCodes["month"]	= "%B";		// August
-	datetimeToCodes["mthnum"]	= "%m";		// 08
-	datetimeToCodes["day"]		= "%d";		// 31
-	datetimeToCodes["sday"]		= "%-d";	// 9
-	datetimeToCodes["hour24"]	= "%H";		// 14
-	datetimeToCodes["hour"]		= "%H";		// 14
-	datetimeToCodes["hour12"]	= "%I";		// 02
-	datetimeToCodes["min"]		= "%M";		// 59
-	datetimeToCodes["ampm"]		= "%p";		// AM
-	datetimeToCodes["second"]	= "%S";		// 59
-	datetimeToCodes["timezone"]	= "%Z";		// PST	
-	-->
 	<string name="TimeHour">hour,datetime,slt</string>
 	<string name="TimeMin">min,datetime,slt</string>
 	<string name="TimeSec">second,datetime,slt</string>	
diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_self.xml b/indra/newview/skins/default/xui/pl/menu_avatar_self.xml
index c2491b1301..cf975d3be4 100755
--- a/indra/newview/skins/default/xui/pl/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/pl/menu_avatar_self.xml
@@ -15,7 +15,7 @@
 			<menu_item_call label="Bieliznę" name="Self Underpants"/>
 			<menu_item_call label="Tatuaż" name="Self Tattoo"/>
 			<menu_item_call label="Fizykę" name="Self Physics"/>
-			<menu_item_call label="Ubranie alpha" name="Self Alpha"/>
+			<menu_item_call label="Warstwę alpha" name="Self Alpha"/>
 			<menu_item_call label="Wszystko" name="All Clothes"/>
 		</context_menu>
 		<context_menu label="Odłącz" name="Object Detach"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml b/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml
index ee60d3feb6..f9928f12a3 100755
--- a/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml
@@ -2,4 +2,5 @@
 <context_menu name="COF Body">
 	<menu_item_call label="Zastąp" name="replace"/>
 	<menu_item_call label="Edytuj" name="edit"/>
+	<menu_item_call label="Utwórz nową" name="create_new"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory.xml b/indra/newview/skins/default/xui/pl/menu_inventory.xml
index f2b20aaa76..34903c28a0 100755
--- a/indra/newview/skins/default/xui/pl/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory.xml
@@ -56,7 +56,7 @@
 	<menu_item_call label="Usuń obiekt" name="Purge Item"/>
 	<menu_item_call label="Przywróć obiekt" name="Restore Item"/>
 	<menu_item_call label="Otwórz" name="Open"/>
-	<menu_item_call label="Otwórz oryginalne" name="Open Original"/>
+	<menu_item_call label="Otwórz oryginał" name="Open Original"/>
 	<menu_item_call label="Właściwości" name="Properties"/>
 	<menu_item_call label="Zmień nazwę" name="Rename"/>
 	<menu_item_call label="Kopiuj identyfikator UUID" name="Copy Asset UUID"/>
@@ -75,10 +75,10 @@
 	<menu_item_call label="Rozpocznij konferencję czatową" name="Conference Chat Folder"/>
 	<menu_item_call label="Odtwarzaj" name="Sound Play"/>
 	<menu_item_call label="Kopiuj SLurl" name="url_copy"/>
-	<menu_item_call label="O Miejscu" name="About Landmark"/>
+	<menu_item_call label="O miejscu" name="About Landmark"/>
 	<menu_item_call label="Pokaż na mapie" name="show_on_map"/>
-	<menu_item_call label="Odtwarzaj publicznie" name="Animation Play"/>
-	<menu_item_call label="Odtwarzaj lokalnie" name="Animation Audition"/>
+	<menu_item_call label="Odtwórz publicznie" name="Animation Play"/>
+	<menu_item_call label="Odtwórz prywatnie" name="Animation Audition"/>
 	<menu_item_call label="Wyślij wiadomość IM" name="Send Instant Message"/>
 	<menu_item_call label="Proponuj teleport" name="Offer Teleport..."/>
 	<menu_item_call label="Poproś o teleport" name="Request Teleport..."/>
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml
index 3272dd3d89..bdac122e35 100755
--- a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml
@@ -23,7 +23,7 @@
 		<menu_item_call label="Nowe rękawiczki" name="New Gloves"/>
 		<menu_item_call label="Nowy podkoszulek" name="New Undershirt"/>
 		<menu_item_call label="Nowa bielizna" name="New Underpants"/>
-		<menu_item_call label="Nowa maska alpha" name="New Alpha"/>
+		<menu_item_call label="Nowa warstwa alpha" name="New Alpha"/>
 		<menu_item_call label="Nowy tatuaż" name="New Tattoo"/>
 		<menu_item_call label="Nowa fizyka" name="New Physics"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
index 74822c0500..07e67f9782 100755
--- a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_gear_default">
 	<menu_item_call label="Nowe okno Szafy" name="new_window"/>
-	<menu_item_check label="Porządkuj według nazwy" name="sort_by_name"/>
-	<menu_item_check label="Porządkuj według daty" name="sort_by_recent"/>
+	<menu_item_check label="Porządkuj według nazw" name="sort_by_name"/>
+	<menu_item_check label="Porządkuj według dat" name="sort_by_recent"/>
 	<menu_item_check label="Sortuj foldery zawsze wg. nazwy" name="sort_folders_by_name"/>
 	<menu_item_check label="Sortuj foldery systemowe od góry" name="sort_system_folders_to_top"/>
 	<context_menu label="Szukaj po..." name="inventory_search_menu">
diff --git a/indra/newview/skins/default/xui/pl/menu_navbar.xml b/indra/newview/skins/default/xui/pl/menu_navbar.xml
index 7516725bc1..594dd5ddda 100755
--- a/indra/newview/skins/default/xui/pl/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/pl/menu_navbar.xml
@@ -2,7 +2,6 @@
 <menu name="Navbar Menu">
 	<menu_item_check label="Pokaż współrzędne" name="Show Coordinates"/>
 	<menu_item_check label="Pokaż właściwości działki" name="Show Parcel Properties"/>
-	<menu_item_call label="Landmark" name="Landmark"/>
 	<menu_item_call label="Wytnij" name="Cut"/>
 	<menu_item_call label="Kopiuj" name="Copy"/>
 	<menu_item_call label="Wklej" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml
index 507697f619..5ee31715bc 100755
--- a/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml
@@ -13,7 +13,7 @@
 		<menu_item_call label="Nowe rękawiczki" name="New Gloves"/>
 		<menu_item_call label="Nowy podkoszulek" name="New Undershirt"/>
 		<menu_item_call label="Nowa bielizna" name="New Underpants"/>
-		<menu_item_call label="Nowa maska alpha" name="New Alpha"/>
+		<menu_item_call label="Nowa warstwa alpha" name="New Alpha"/>
 		<menu_item_call label="Nowa fizyka" name="New Physics"/>
 		<menu_item_call label="Nowy tatuaż" name="New Tattoo"/>
 	</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_picks.xml b/indra/newview/skins/default/xui/pl/menu_picks.xml
index 6f6e4b7fa8..4b1b234676 100755
--- a/indra/newview/skins/default/xui/pl/menu_picks.xml
+++ b/indra/newview/skins/default/xui/pl/menu_picks.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Picks">
-	<menu_item_call label="Info" name="pick_info"/>
 	<menu_item_call label="Edytuj" name="pick_edit"/>
 	<menu_item_call label="Teleportuj" name="pick_teleport"/>
 	<menu_item_call label="Mapa" name="pick_map"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_topinfobar.xml b/indra/newview/skins/default/xui/pl/menu_topinfobar.xml
index 2869d2556d..e347070c38 100755
--- a/indra/newview/skins/default/xui/pl/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/pl/menu_topinfobar.xml
@@ -2,6 +2,5 @@
 <menu name="menu_topinfobar">
 	<menu_item_check label="Pokaż współrzędne" name="Show Coordinates"/>
 	<menu_item_check label="Pokaż detale działki" name="Show Parcel Properties"/>
-	<menu_item_call label="Landmark" name="Landmark"/>
 	<menu_item_call label="Kopiuj" name="Copy"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml
index 83bd67216c..b69c10719b 100755
--- a/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml
@@ -10,5 +10,7 @@
 	<menu_item_call label="Odłącz" name="detach"/>
 	<menu_item_call label="Zdejmij" name="take_off"/>
 	<menu_item_call label="Profil obiektu" name="object_profile"/>
-	<menu_item_call label="Pokaż oryginalny" name="show_original"/>
+	<menu_item_call label="Pokaż oryginał" name="show_original"/>
+	<menu_item_call label="Utwórz nowe" name="create_new"/>
+	<menu_item_call label="--brak opcji--" name="--no options--"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pl/mime_types.xml b/indra/newview/skins/default/xui/pl/mime_types.xml
index 7330ae8cdb..97ef0ed50e 100755
--- a/indra/newview/skins/default/xui/pl/mime_types.xml
+++ b/indra/newview/skins/default/xui/pl/mime_types.xml
@@ -49,7 +49,7 @@
 	</widgetset>
 	<scheme name="rtsp">
 		<label name="rtsp_label">
-			Strumieniowe w czasie rzeczywistym
+			Strumień w czasie rzeczywistym
 		</label>
 	</scheme>
 	<mimetype name="blank">
@@ -82,11 +82,6 @@
 			Film (QuickTime)
 		</label>
 	</mimetype>
-	<mimetype name="application/javascript">
-		<label name="application/javascript_label">
-			Javascript
-		</label>
-	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">
 			Dźwięk/Film Ogg
@@ -149,12 +144,12 @@
 	</mimetype>
 	<mimetype name="image/jpeg">
 		<label name="image/jpeg_label">
-			Image (JPEG)
+			Obraz (JPEG)
 		</label>
 	</mimetype>
 	<mimetype name="image/png">
 		<label name="image/png_label">
-			Image (PNG)
+			Obraz (PNG)
 		</label>
 	</mimetype>
 	<mimetype name="image/svg+xml">
diff --git a/indra/newview/skins/default/xui/pl/mime_types_mac.xml b/indra/newview/skins/default/xui/pl/mime_types_mac.xml
index f574c90dec..2f09cd2016 100755
--- a/indra/newview/skins/default/xui/pl/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/pl/mime_types_mac.xml
@@ -19,10 +19,10 @@
 			Film
 		</label>
 		<tooltip name="movie_tooltip">
-			To miejsce posiada zawartość filmową
+			To miejsce wyświetla filmy
 		</tooltip>
 		<playtip name="movie_playtip">
-			Oglądaj film
+			Zacznij odtwarzanie filmu
 		</playtip>
 	</widgetset>
 	<widgetset name="image">
@@ -30,10 +30,10 @@
 			Obraz
 		</label>
 		<tooltip name="image_tooltip">
-			To miejsce posiada zwartość graficzną
+			W tym miejscu można zobaczyć obrazy
 		</tooltip>
 		<playtip name="image_playtip">
-			Zobacz zdjęcie miejsca
+			Zobacz obrazy wyświetlane w tym miejscu
 		</playtip>
 	</widgetset>
 	<widgetset name="audio">
@@ -41,15 +41,15 @@
 			Dźwięk
 		</label>
 		<tooltip name="audio_tooltip">
-			To miejsce posiada zawartość dźwiękową
+			W tym miejscu odtwarzane są dźwięki
 		</tooltip>
 		<playtip name="audio_playtip">
-			Rozpocznij odtwarzanie dźwięków
+			Zacznij odtwarzanie dźwięków
 		</playtip>
 	</widgetset>
 	<scheme name="rtsp">
 		<label name="rtsp_label">
-			Synchroniczne strumienie mediów
+			Strumień w czasie rzeczywistym
 		</label>
 	</scheme>
 	<mimetype name="blank">

From 276779078feb1b04b47c9ec078754da5f0161643 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 10 Nov 2014 08:40:51 +0100
Subject: [PATCH 096/229] [Group Bans] Fix compiler warning

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

diff --git a/indra/newview/llfloatergroupbulkban.cpp b/indra/newview/llfloatergroupbulkban.cpp
index 54a2283b13..44074047a7 100644
--- a/indra/newview/llfloatergroupbulkban.cpp
+++ b/indra/newview/llfloatergroupbulkban.cpp
@@ -101,7 +101,7 @@ void LLFloaterGroupBulkBan::showForGroup(const LLUUID& group_id, uuid_vec_t* age
 	// Make sure group_id isn't null
 	if (group_id.isNull())
 	{
-		llwarns << "LLFloaterGroupInvite::showForGroup with null group_id!" << llendl;
+		LL_WARNS() << "LLFloaterGroupInvite::showForGroup with null group_id!" << LL_ENDL;
 		return;
 	}
 

From c794b3592f8d871c69f129ff7fef62f73f24cd82 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 10 Nov 2014 08:55:48 +0100
Subject: [PATCH 097/229] FIRE-14943: Gear button in radar circumvents RLVa
 shownames restriction

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

diff --git a/indra/newview/fspanelradar.cpp b/indra/newview/fspanelradar.cpp
index 849b7d1c1d..2ae17addd5 100644
--- a/indra/newview/fspanelradar.cpp
+++ b/indra/newview/fspanelradar.cpp
@@ -190,7 +190,7 @@ void FSPanelRadar::updateButtons()
 		is_friend = LLAvatarTracker::instance().getBuddyInfo(selected_id) != NULL;
 	}
 	mAddFriendButton->setEnabled(!is_friend && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
-	mRadarGearButton->setEnabled(selected_uuids.size() > 0);
+	mRadarGearButton->setEnabled(selected_uuids.size() > 0 && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
 }
 
 LLUUID FSPanelRadar::getCurrentItemID() const

From 04bd6145414dc1a65bc068144436808d5e1d56fb Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 10 Nov 2014 12:25:49 +0100
Subject: [PATCH 098/229] FIRE-14929: Pull missing changes to make mouse walk
 work correctly

---
 indra/newview/lltoolfocus.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp
index 0c13155857..3039bac5c1 100755
--- a/indra/newview/lltoolfocus.cpp
+++ b/indra/newview/lltoolfocus.cpp
@@ -315,14 +315,16 @@ BOOL LLToolCamera::handleMouseUp(S32 x, S32 y, MASK mask)
 	return TRUE;
 }
 
-static bool right_hold_mouse_walk=false;//<FS:JL> Mouse movement by Singularity
+static bool right_hold_mouse_walk = false;//<FS:JL> Mouse movement by Singularity
 
 BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 {
-	if(right_hold_mouse_walk)//<FS:JL> Mouse movement by Singularity
+	//<FS:JL> Mouse movement by Singularity
+	if (right_hold_mouse_walk)
 	{
 		agent_push_forward(KEYSTATE_LEVEL);
-	}//</FS:JL>
+	}
+	//</FS:JL>
 	
 	S32 dx = gViewerWindow->getCurrentMouseDX();
 	S32 dy = gViewerWindow->getCurrentMouseDY();
@@ -460,7 +462,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 //<FS:JL> Mouse movement by Singularity
 BOOL LLToolCamera::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-	if(mMouseSteering)
+	if (mMouseSteering)
 	{
 		agent_push_forward(KEYSTATE_DOWN);
 		right_hold_mouse_walk = true;
@@ -474,19 +476,22 @@ BOOL LLToolCamera::handleRightMouseDown(S32 x, S32 y, MASK mask)
 
 BOOL LLToolCamera::handleRightMouseUp(S32 x, S32 y, MASK mask)
 {
-	if(mMouseSteering || right_hold_mouse_walk)
+	if (mMouseSteering || right_hold_mouse_walk)
 	{
-	agent_push_forward(KEYSTATE_UP);
-	right_hold_mouse_walk = false;
-	return TRUE;
+		agent_push_forward(KEYSTATE_UP);
+		right_hold_mouse_walk = false;
+		return TRUE;
 	}
 	else
 	{
-	return FALSE;
+		return FALSE;
 	}
 }
 //</FS:JL>
+
 void LLToolCamera::onMouseCaptureLost()
 {
 	releaseMouse();
+	// <FS:Ansariel> Mouse movement by Singularity
+	handleRightMouseUp(0,0,0);
 }

From 8471e87e18da4c0170345a9d00362418659ae38a Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Mon, 10 Nov 2014 20:25:04 +0100
Subject: [PATCH 099/229] Polish translation tune-up

---
 .../skins/ansastorm/xui/pl/panel_edit_underpants.xml     | 2 +-
 .../skins/default/xui/pl/panel_avatar_list_item.xml      | 9 ---------
 .../skins/default/xui/pl/panel_block_list_sidetray.xml   | 2 +-
 .../skins/default/xui/pl/panel_edit_classified.xml       | 8 ++++----
 indra/newview/skins/default/xui/pl/panel_edit_pick.xml   | 4 ++--
 .../skins/default/xui/pl/panel_edit_underpants.xml       | 2 +-
 .../newview/skins/default/xui/pl/panel_group_invite.xml  | 6 +++---
 .../skins/default/xui/pl/panel_group_land_money.xml      | 1 -
 .../newview/skins/default/xui/pl/panel_landmark_info.xml | 5 ++---
 indra/newview/skins/default/xui/pl/panel_me.xml          | 2 +-
 .../default/xui/pl/panel_media_settings_general.xml      | 2 +-
 .../skins/firestorm/xui/pl/panel_edit_underpants.xml     | 2 +-
 .../skins/starlight/xui/pl/panel_group_land_money.xml    | 1 -
 .../skins/starlightcui/xui/pl/floater_preferences.xml    | 1 -
 .../skins/starlightcui/xui/pl/panel_group_land_money.xml | 1 -
 15 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/indra/newview/skins/ansastorm/xui/pl/panel_edit_underpants.xml b/indra/newview/skins/ansastorm/xui/pl/panel_edit_underpants.xml
index e0e7a5a46b..751b5bc39a 100644
--- a/indra/newview/skins/ansastorm/xui/pl/panel_edit_underpants.xml
+++ b/indra/newview/skins/ansastorm/xui/pl/panel_edit_underpants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_underpants_panel">
 	<panel name="avatar_underpants_color_panel">
-		<texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać kolor"/>
+		<texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/>
 		<color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/>
 	</panel>
 	<panel name="underpants_main_tab_holder">
diff --git a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
index 15fcaa2e7d..9c5f504a8f 100755
--- a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="avatar_list_item">
-	<string name="FormatSeconds">
-		[COUNT]s
-	</string>
-	<string name="FormatMinutes">
-		[COUNT]m
-	</string>
 	<string name="FormatHours">
 		[COUNT]g
 	</string>
-	<string name="FormatDays">
-		[COUNT]d
-	</string>
 	<string name="FormatWeeks">
 		[COUNT]tyg
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml
index ec3db3c30a..098555bdc5 100755
--- a/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
+	<panel name="blocked_buttons_panel">
 		<filter_editor label="Filtruj" name="blocked_filter_input" />
 		<menu_button name="blocked_gear_btn" tool_tip="Akcje możliwe do wykonania dla wybranego Rezydenta lub obiektu" />
 		<menu_button name="view_btn" tool_tip="Opcje sortowania" />
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_classified.xml b/indra/newview/skins/default/xui/pl/panel_edit_classified.xml
index 4e9b0c09c6..2dfe56c697 100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_classified.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Edytuj Reklamę" name="panel_edit_classified">
+<panel label="Edytuj reklamę" name="panel_edit_classified">
 	<panel.string name="location_notice">
 		(zostanie zaktualizowane po zapisaniu)
 	</panel.string>
@@ -37,11 +37,11 @@
 				<icons_combo_box.item label="Treść General" name="pg_ci"/>
 			</icons_combo_box>
 			<check_box label="Ponawiaj automatycznie co tydzień" name="auto_renew"/>
-			<text name="price_for_listing_label" value="Cena za wyświetlenie:"/>
-			<spinner name="price_for_listing" tool_tip="Cena za umieszczenie reklamy."/>
+			<text name="price_for_listing_label" value="Koszt listowania:"/>
+			<spinner name="price_for_listing" tool_tip="Koszt listowania reklamy."/>
 		</panel>
 	</scroll_container>
-	<panel label="bottom_panel" name="bottom_panel">
+	<panel name="bottom_panel">
 		<layout_stack name="bottom_panel_ls">
 			<layout_panel name="show_on_map_btn_lp">
 				<button label="Anuluj" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
index 0e4fc986cd..e6052abb70 100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Edytuj Ulubione" name="panel_edit_pick">
+<panel label="Edytuj Miejsce" name="panel_edit_pick">
 	<panel.string name="location_notice">
 		(aktualizacja nastąpi po zapisaniu)
 	</panel.string>
 	<text name="title">
-		Edytuj Ulubione
+		Edytuj Miejsce
 	</text>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml b/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml
index d7bac9f450..1877bfb954 100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_underpants_panel">
 	<panel name="avatar_underpants_color_panel">
-		<texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać kolor"/>
+		<texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/>
 		<color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/pl/panel_group_invite.xml b/indra/newview/skins/default/xui/pl/panel_group_invite.xml
index 2fed016579..5be92e46f0 100755
--- a/indra/newview/skins/default/xui/pl/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_invite.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Zaproszenie do Grupy" name="invite_panel">
+<panel label="Zaproś do grupy" name="invite_panel">
 	<panel.string name="confirm_invite_owner_str">
 		Jesteś pewny/a, że chcesz wybrać nowych właścieli grupy? Ta decyzja jest ostateczna!
 	</panel.string>
@@ -7,7 +7,7 @@
 		(ładowanie...)
 	</panel.string>
 	<panel.string name="already_in_group">
-		Niektórzy Rezydenci, których wybrałeś już należą do grupy i nie otrzymali zaproszenia.
+		Niektórzy Rezydenci, których wybrałeś/aś już należą do grupy i nie otrzymali zaproszenia.
 	</panel.string>
 	<panel.string name="invite_selection_too_large">
 		Zaproszenia nie zostały wysłane: wybrano zbyt wielu Rezydentów. Limit to 100 zaproszeń na jedno żądanie.
@@ -21,7 +21,7 @@
 	<text name="role_text">
 		Wybierz funkcję dla nowej osoby:
 	</text>
-	<combo_box name="role_name" tool_tip="Wybierz z listy funkcje, które możesz przypisać osobom"/>
+	<combo_box name="role_name" tool_tip="Wybierz rolę z listy funkcji, które możesz przypisać osobom w grupie"/>
 	<button label="Wyślij zaproszenia" name="invite_button"/>
 	<button label="Anuluj" name="cancel_button"/>
 	<string name="GroupInvitation">
diff --git a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml
index 10ca094324..06fd344631 100755
--- a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml
@@ -20,7 +20,6 @@
 	</panel.string>
 	<scroll_list name="group_parcel_list">
 		<scroll_list.columns label="Działka" name="name"/>
-		<scroll_list.columns label="Region" name="location"/>
 		<scroll_list.columns label="Typ" name="type"/>
 		<scroll_list.columns label="Obszar" name="area"/>
 		<scroll_list.columns label="Ukryte" name="hidden"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
index 8bae3e1a3a..c4045e59c3 100755
--- a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="landmark_info">
 	<string name="title_create_landmark" value="Zapamiętaj miejsce (LM)"/>
-	<string name="title_edit_landmark" value="Edytuj landmarki"/>
-	<string name="title_landmark" value="Landmarki (LM)"/>
+	<string name="title_edit_landmark" value="Edytuj landmark"/>
+	<string name="title_landmark" value="Landmark (LM)"/>
 	<string name="unknown" value="(nieznane)"/>
 	<string name="public" value="(publiczne)"/>
 	<string name="server_update_text">
@@ -31,7 +31,6 @@
 				<text name="owner_label" value="Właściciel:"/>
 				<text name="creator_label" value="Twórca:"/>
 				<text name="created_label" value="Data:"/>
-				<text name="information_label" value="Info:"/>
 			</panel>
 			<panel name="landmark_edit_panel">
 				<text name="title_label" value="Tytuł:"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_me.xml b/indra/newview/skins/default/xui/pl/panel_me.xml
index eb5e325f78..a509db6977 100755
--- a/indra/newview/skins/default/xui/pl/panel_me.xml
+++ b/indra/newview/skins/default/xui/pl/panel_me.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Mój Profil" name="panel_me">
-	<panel label="ULUBIONE" name="panel_picks"/>
+	<panel label="MIEJSCA" name="panel_picks"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml
index dd7f413f06..1c58b82c65 100755
--- a/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml
@@ -4,7 +4,7 @@
 		Strona domowa:
 	</text>
 	<text name="home_fails_whitelist_label">
-		(ta strona nie przeszła przez filtr Białej Listy)
+		(Ta strona nie przeszła przez filtr białej listy)
 	</text>
 	<line_editor name="home_url" tool_tip="Strona domowa dla źródła mediów"/>
 	<text name="preview_label">
diff --git a/indra/newview/skins/firestorm/xui/pl/panel_edit_underpants.xml b/indra/newview/skins/firestorm/xui/pl/panel_edit_underpants.xml
index e0e7a5a46b..751b5bc39a 100644
--- a/indra/newview/skins/firestorm/xui/pl/panel_edit_underpants.xml
+++ b/indra/newview/skins/firestorm/xui/pl/panel_edit_underpants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_underpants_panel">
 	<panel name="avatar_underpants_color_panel">
-		<texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać kolor"/>
+		<texture_picker label="Tekstura" name="Fabric" tool_tip="Kliknij aby wybrać teksturę"/>
 		<color_swatch label="Kolor" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/>
 	</panel>
 	<panel name="underpants_main_tab_holder">
diff --git a/indra/newview/skins/starlight/xui/pl/panel_group_land_money.xml b/indra/newview/skins/starlight/xui/pl/panel_group_land_money.xml
index 4dd8e2f7b9..ea2e0b6564 100644
--- a/indra/newview/skins/starlight/xui/pl/panel_group_land_money.xml
+++ b/indra/newview/skins/starlight/xui/pl/panel_group_land_money.xml
@@ -21,7 +21,6 @@
 	<panel name="layout_panel_landmoney">
 		<scroll_list name="group_parcel_list">
 			<scroll_list.columns label="Działka" name="name"/>
-			<scroll_list.columns label="Region" name="location"/>
 			<scroll_list.columns label="Typ" name="type"/>
 			<scroll_list.columns label="Obszar" name="area"/>
 			<scroll_list.columns label="Ukryte" name="hidden"/>
diff --git a/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml
index 9a25bc7e22..7a67c2dfba 100644
--- a/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml
+++ b/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml
@@ -4,7 +4,6 @@
 		Zmiana po logowaniu
 	</floater.string>
 	<button label="Zastosuj" label_selected="Zastosuj" name="Apply"/>
-	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
 	<search_editor label="Szukaj w ustawieniach" name="search_prefs_edit" tool_tip="Wprowadź w tym miejscu interesującą Cię frazę. Wyniki będą wyświetlane dla pasujących fragmentów nazw lub komentarzy przypisanych do ustawień." />
 	<tab_container name="pref core">
diff --git a/indra/newview/skins/starlightcui/xui/pl/panel_group_land_money.xml b/indra/newview/skins/starlightcui/xui/pl/panel_group_land_money.xml
index 4dd8e2f7b9..ea2e0b6564 100644
--- a/indra/newview/skins/starlightcui/xui/pl/panel_group_land_money.xml
+++ b/indra/newview/skins/starlightcui/xui/pl/panel_group_land_money.xml
@@ -21,7 +21,6 @@
 	<panel name="layout_panel_landmoney">
 		<scroll_list name="group_parcel_list">
 			<scroll_list.columns label="Działka" name="name"/>
-			<scroll_list.columns label="Region" name="location"/>
 			<scroll_list.columns label="Typ" name="type"/>
 			<scroll_list.columns label="Obszar" name="area"/>
 			<scroll_list.columns label="Ukryte" name="hidden"/>

From fbfd010381ccc010e5ceb650df5932830cbed164 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 19 Mar 2014 17:57:00 -0500
Subject: [PATCH 100/229] MAINT-3131 Use benchmark to determine GPU class
 instead of GPU table.

---
 indra/llrender/llglslshader.cpp    | 50 +++++++++++++++-------
 indra/llrender/llglslshader.h      |  4 +-
 indra/llrender/llrendertarget.cpp  |  1 +
 indra/llrender/llshadermgr.cpp     |  6 ++-
 indra/newview/llfeaturemanager.cpp | 67 +++++++++++++++++++++++++++---
 indra/newview/llglsandbox.cpp      | 31 +++++++++++---
 indra/newview/llviewermenu.cpp     |  2 +-
 7 files changed, 131 insertions(+), 30 deletions(-)

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 34beef6a6b..25c9b5684b 100755
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -87,6 +87,7 @@ LLShaderFeatures::LLShaderFeatures()
 	, mIndexedTextureChannels(0)
 	, disableTextureIndex(false)
 	, hasAlphaMask(false)
+	, attachNothing(false)
 {
 }
 
@@ -119,28 +120,31 @@ struct LLGLSLShaderCompareTimeElapsed
 };
 
 //static
-void LLGLSLShader::finishProfile()
+void LLGLSLShader::finishProfile(bool emit_report)
 {
 	sProfileEnabled = false;
 
-	std::vector<LLGLSLShader*> sorted;
-
-	for (std::set<LLGLSLShader*>::iterator iter = sInstances.begin(); iter != sInstances.end(); ++iter)
+	if (emit_report)
 	{
-		sorted.push_back(*iter);
-	}
+		std::vector<LLGLSLShader*> sorted;
 
-	std::sort(sorted.begin(), sorted.end(), LLGLSLShaderCompareTimeElapsed());
+		for (std::set<LLGLSLShader*>::iterator iter = sInstances.begin(); iter != sInstances.end(); ++iter)
+		{
+			sorted.push_back(*iter);
+		}
 
-	for (std::vector<LLGLSLShader*>::iterator iter = sorted.begin(); iter != sorted.end(); ++iter)
-	{
-		(*iter)->dumpStats();
-	}
+		std::sort(sorted.begin(), sorted.end(), LLGLSLShaderCompareTimeElapsed());
 
+		for (std::vector<LLGLSLShader*>::iterator iter = sorted.begin(); iter != sorted.end(); ++iter)
+		{
+			(*iter)->dumpStats();
+		}
+			
 	LL_INFOS() << "-----------------------------------" << LL_ENDL;
 	LL_INFOS() << "Total rendering time: " << llformat("%.4f ms", sTotalTimeElapsed/1000000.f) << LL_ENDL;
 	LL_INFOS() << "Total samples drawn: " << llformat("%.4f million", sTotalSamplesDrawn/1000000.f) << LL_ENDL;
 	LL_INFOS() << "Total triangles drawn: " << llformat("%.3f million", sTotalTrianglesDrawn/1000000.f) << LL_ENDL;
+	}
 }
 
 void LLGLSLShader::clearStats()
@@ -175,7 +179,7 @@ void LLGLSLShader::dumpStats()
 			}
 		}
 		LL_INFOS() << "=============================================" << LL_ENDL;
-
+	
 		F32 ms = mTimeElapsed/1000000.f;
 		F32 seconds = ms/1000.f;
 
@@ -221,6 +225,7 @@ void LLGLSLShader::placeProfileQuery()
 #if !LL_DARWIN
 	if (mTimerQuery == 0)
 	{
+		glGenQueriesARB(1, &mSamplesQuery);
 		glGenQueriesARB(1, &mTimerQuery);
 	}
 
@@ -257,7 +262,7 @@ void LLGLSLShader::placeProfileQuery()
 	}
 
 
-	glBeginQueryARB(GL_SAMPLES_PASSED, 1);
+	glBeginQueryARB(GL_SAMPLES_PASSED, mSamplesQuery);
 	glBeginQueryARB(GL_TIME_ELAPSED, mTimerQuery);
 #endif
 }
@@ -275,7 +280,7 @@ void LLGLSLShader::readProfileQuery(U32 count, U32 mode)
 
 	//U64 samples_passed = 0;
 	GLuint64 samples_passed = 0;
-	glGetQueryObjectui64v(1, GL_QUERY_RESULT, &samples_passed);
+	glGetQueryObjectui64v(mSamplesQuery, GL_QUERY_RESULT, &samples_passed);
 
 	sTotalTimeElapsed += time_elapsed;
 	mTimeElapsed += time_elapsed;
@@ -310,14 +315,15 @@ LLGLSLShader::LLGLSLShader()
 	  mShaderLevel(0), 
 	  mShaderGroup(SG_DEFAULT), 
 	  mUniformsDirty(FALSE),
-	  mTimerQuery(0)
+	  mTimerQuery(0),
+	  mSamplesQuery(0)
+
 {
 	
 }
 
 LLGLSLShader::~LLGLSLShader()
 {
-	
 }
 
 void LLGLSLShader::unload()
@@ -352,6 +358,18 @@ void LLGLSLShader::unload()
 		mProgramObject = 0;
 	}
 	
+	if (mTimerQuery)
+	{
+		glDeleteQueriesARB(1, &mTimerQuery);
+		mTimerQuery = 0;
+	}
+	
+	if (mSamplesQuery)
+	{
+		glDeleteQueriesARB(1, &mSamplesQuery);
+		mSamplesQuery = 0;
+	}
+
 	//hack to make apple not complain
 	glGetError();
 	
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index 7b2f5f04c2..5abddf274b 100755
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -51,6 +51,7 @@ public:
 	S32 mIndexedTextureChannels;
 	bool disableTextureIndex;
 	bool hasAlphaMask;
+	bool attachNothing;
 
 	// char numLights;
 	
@@ -80,7 +81,7 @@ public:
 	static bool sNoFixedFunction;
 
 	static void initProfile();
-	static void finishProfile();
+	static void finishProfile(bool emit_report = true);
 
 	static void startProfile();
 	static void stopProfile(U32 count, U32 mode);
@@ -184,6 +185,7 @@ public:
 
 	//statistcis for profiling shader performance
 	U32 mTimerQuery;
+	U32 mSamplesQuery;
 	U64 mTimeElapsed;
 	static U64 sTotalTimeElapsed;
 	U32 mTrianglesDrawn;
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index 955ea450c1..cd484b4fe9 100755
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -388,6 +388,7 @@ void LLRenderTarget::release()
 	//
 	if (mFBO && (mTex.size() > 1))
 	{		
+		glBindFramebuffer(GL_FRAMEBUFFER, mFBO);
 		S32 z;
 		for (z = mTex.size() - 1; z >= 1; z--)
 		{
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index ef855e293d..35da8ab2c4 100755
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -73,7 +73,11 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
 {
 	llassert_always(shader != NULL);
 	LLShaderFeatures *features = & shader->mFeatures;
-	
+
+	if (features->attachNothing)
+	{
+		return TRUE;
+	}
 	//////////////////////////////////////
 	// Attach Vertex Shader Features First
 	//////////////////////////////////////
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index cac50ef24d..983a915758 100755
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -421,13 +421,67 @@ bool LLFeatureManager::parseFeatureTable(std::string filename)
 	return parse_ok;
 }
 
+F32 gpu_benchmark();
+
 bool LLFeatureManager::loadGPUClass()
 {
-	// defaults
-	mGPUClass = GPU_CLASS_UNKNOWN;
-	mGPUString = gGLManager.getRawGLString();
-	mGPUSupported = FALSE;
+	//get memory bandwidth from benchmark
+	F32 gbps = gpu_benchmark();
 
+	if (gbps < -1.f)
+	{ //couldn't bench, use GLVersion
+
+		if (gGLManager.mGLVersion < 2.f)
+		{
+			mGPUClass = GPU_CLASS_0;
+		}
+		else if (gGLManager.mGLVersion < 3.f)
+		{
+			mGPUClass = GPU_CLASS_1;
+		}
+		else if (gGLManager.mGLVersion < 3.3f)
+		{
+			mGPUClass = GPU_CLASS_2;
+		}
+		else if (gGLManager.mGLVersion < 4.f)
+		{
+			mGPUClass = GPU_CLASS_3;
+		}
+		else 
+		{
+			mGPUClass = GPU_CLASS_4;
+		}
+	}
+	else if (gbps < 5.f)
+	{
+		mGPUClass = GPU_CLASS_0;
+	}
+	else if (gbps < 10.f)
+	{
+		mGPUClass = GPU_CLASS_1;
+	}
+	else if (gbps < 20.f)
+	{
+		mGPUClass = GPU_CLASS_2;
+	}
+	else if (gbps < 40.f)
+	{
+		mGPUClass = GPU_CLASS_3;
+	}
+	else if (gbps < 80.f)
+	{
+		mGPUClass = GPU_CLASS_4;
+	}
+	else 
+	{
+		mGPUClass = GPU_CLASS_5;
+	}
+	
+	// defaults
+	mGPUString = gGLManager.getRawGLString();
+	mGPUSupported = TRUE;
+
+#if 0
 	// first table is in the app dir
 	std::string app_path = gDirUtilp->getAppRODataDir();
 	app_path += gDirUtilp->getDirDelimiter();
@@ -455,8 +509,8 @@ bool LLFeatureManager::loadGPUClass()
 	{
 		parse_ok = parseGPUTable(app_path);
 	}
-    
-	return parse_ok; // indicates that the file parsed correctly, not that the gpu was recognized
+#endif
+	return true; // indicates that the file parsed correctly, not that the gpu was recognized
 }
 
 	
@@ -766,6 +820,7 @@ void LLFeatureManager::init()
 
 void LLFeatureManager::applyRecommendedSettings()
 {
+	loadGPUClass();
 	// apply saved settings
 	// cap the level at 2 (high)
 	U32 level = llmax(GPU_CLASS_0, llmin(mGPUClass, GPU_CLASS_5));
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 71b837c896..0bac00864f 100755
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -943,13 +943,32 @@ void LLViewerObjectList::renderObjectBeacons()
 }
 
 
-void gpu_benchmark()
+F32 gpu_benchmark()
 {
-	if (!LLGLSLShader::sNoFixedFunction)
-	{ //don't bother benchmarking the fixed function
-		return;
+	if (!gGLManager.mHasShaderObjects || !gGLManager.mHasTimerQuery)
+	{ //don't bother benchmarking the fixed function or using CPU timers
+		return -1.f;
 	}
 
+	
+	if (gBenchmarkProgram.mProgramObject == 0)
+	{
+		LLViewerShaderMgr::instance()->initAttribsAndUniforms();
+
+		gBenchmarkProgram.mName = "Benchmark Shader";
+		gBenchmarkProgram.mFeatures.attachNothing = true;
+		gBenchmarkProgram.mShaderFiles.clear();
+		gBenchmarkProgram.mShaderFiles.push_back(std::make_pair("interface/benchmarkV.glsl", GL_VERTEX_SHADER_ARB));
+		gBenchmarkProgram.mShaderFiles.push_back(std::make_pair("interface/benchmarkF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gBenchmarkProgram.mShaderLevel = 1;
+		if (!gBenchmarkProgram.createShader(NULL, NULL))
+		{
+			return -1.f;
+		}
+	}
+
+	LLGLDisable blend(GL_BLEND);
+	
 	//measure memory bandwidth by:
 	// - allocating a batch of textures and render targets
 	// - rendering those textures to those render targets
@@ -1047,7 +1066,7 @@ void gpu_benchmark()
 
 	gBenchmarkProgram.unbind();
 
-	LLGLSLShader::finishProfile();
+	LLGLSLShader::finishProfile(false);
 	
 	LLImageGL::deleteTextures(count, source);
 
@@ -1073,5 +1092,7 @@ void gpu_benchmark()
 	{
 		LL_INFOS() << "ARB_timer_query unavailable." << LL_ENDL;
 	}
+
+	return gbps;
 }
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 6ebb1103e7..99985041b5 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -8730,7 +8730,7 @@ class LLAdvancedClickRenderProfile: public view_listener_t
 	}
 };
 
-void gpu_benchmark();
+F32 gpu_benchmark();
 
 class LLAdvancedClickRenderBenchmark: public view_listener_t
 {

From 79aa716ed8ae0c8f8f22fb4285f57b1ae8bd7e41 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 21 Mar 2014 14:30:14 -0500
Subject: [PATCH 101/229] MAINT-3131 fallback to CPU timers for return value of
 benchmark if ARB_timer_query is unavailable.

---
 indra/newview/llglsandbox.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 0bac00864f..5b221f916a 100755
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -945,8 +945,8 @@ void LLViewerObjectList::renderObjectBeacons()
 
 F32 gpu_benchmark()
 {
-	if (!gGLManager.mHasShaderObjects || !gGLManager.mHasTimerQuery)
-	{ //don't bother benchmarking the fixed function or using CPU timers
+	if (!gGLManager.mHasShaderObjects)
+	{ //don't bother benchmarking the fixed function
 		return -1.f;
 	}
 
@@ -1077,15 +1077,15 @@ F32 gpu_benchmark()
 
 	LL_INFOS() << "Memory bandwidth is " << llformat("%.3f", gbps) << "GB/sec according to CPU timers" << LL_ENDL;
 	
-	F32 ms = gBenchmarkProgram.mTimeElapsed/1000000.f;
-	F32 seconds = ms/1000.f;
-
-	F64 samples_drawn = res*res*count*samples;
-	F32 samples_sec = (samples_drawn/1000000000.0)/seconds;
-	gbps = samples_sec*8;
-
 	if (gGLManager.mHasTimerQuery)
 	{
+		F32 ms = gBenchmarkProgram.mTimeElapsed/1000000.f;
+		F32 seconds = ms/1000.f;
+
+		F64 samples_drawn = res*res*count*samples;
+		F32 samples_sec = (samples_drawn/1000000000.0)/seconds;
+		gbps = samples_sec*8;
+
 		LL_INFOS() << "Memory bandwidth is " << llformat("%.3f", gbps) << "GB/sec according to ARB_timer_query" << LL_ENDL;
 	}
 	else

From 3043baba56531c3821f107b5b2bc496a8e9d4114 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 21 Mar 2014 14:33:46 -0500
Subject: [PATCH 102/229] MAINT-3131 Actually fallback to GL version guess
 instead of treating error value from gpu_benchmark as actual memory
 bandwidth.

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

diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 983a915758..1e29b64b22 100755
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -428,7 +428,7 @@ bool LLFeatureManager::loadGPUClass()
 	//get memory bandwidth from benchmark
 	F32 gbps = gpu_benchmark();
 
-	if (gbps < -1.f)
+	if (gbps < 0.f)
 	{ //couldn't bench, use GLVersion
 
 		if (gGLManager.mGLVersion < 2.f)

From 3ffea62f4326b80b0f447785a82bc4b8d2274bc9 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 24 Mar 2014 11:56:02 -0500
Subject: [PATCH 103/229] MAINT-3131 Attempt to work around drivers that lack
 timer query and ignore glFinish calls.

---
 indra/newview/llglsandbox.cpp | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 5b221f916a..6caf1a5d69 100755
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -1035,6 +1035,8 @@ F32 gpu_benchmark()
 	//wait for any previoius GL commands to finish
 	glFinish();
 	
+	bool busted_finish = false;
+
 	for (S32 c = -1; c < samples; ++c)
 	{
 		LLTimer timer;
@@ -1049,7 +1051,18 @@ F32 gpu_benchmark()
 		}
 		
 		//wait for current batch of copies to finish
-		glFinish();
+		if (busted_finish)
+		{
+			//read a pixel off the last target since some drivers seem to ignore glFinish
+			dest[count-1].bindTarget();
+			U32 pixel = 0;
+			glReadPixels(0,0,1,1,GL_RGBA, GL_UNSIGNED_BYTE, &pixel);
+			dest[count-1].flush();
+		}
+		else
+		{
+			glFinish();
+		}
 
 		F32 time = timer.getElapsedTimeF32();
 
@@ -1060,7 +1073,14 @@ F32 gpu_benchmark()
 
 			F32 gbps = gb/time;
 
-			results.push_back(gbps);
+			if (!gGLManager.mHasTimerQuery && !busted_finish && gbps > 128.f)
+			{ //unrealistically high bandwidth for a card without timer queries, glFinish is probably ignored
+				busted_finish = true;
+			}
+			else
+			{
+				results.push_back(gbps);
+			}		
 		}
 	}
 

From df58a78ece15053797e8987180b146ef874b0cba Mon Sep 17 00:00:00 2001
From: davep <none@none>
Date: Fri, 19 Sep 2014 13:01:41 -0500
Subject: [PATCH 104/229] MAINT-3131 Discard improbably high memory bandwidth
 measurements on OSX and default to Class 3

---
 indra/newview/llfeaturemanager.cpp |  6 +++++-
 indra/newview/llglsandbox.cpp      | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 1e29b64b22..03e6f96281 100755
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -430,7 +430,10 @@ bool LLFeatureManager::loadGPUClass()
 
 	if (gbps < 0.f)
 	{ //couldn't bench, use GLVersion
-
+#if LL_DARWIN
+        //GLVersion is misleading on OSX, just default to class 3 if we can't bench
+        mGPUClass = GPU_CLASS_3;
+#else
 		if (gGLManager.mGLVersion < 2.f)
 		{
 			mGPUClass = GPU_CLASS_0;
@@ -451,6 +454,7 @@ bool LLFeatureManager::loadGPUClass()
 		{
 			mGPUClass = GPU_CLASS_4;
 		}
+#endif
 	}
 	else if (gbps < 5.f)
 	{
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 6caf1a5d69..f8ecdf0801 100755
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -1015,6 +1015,8 @@ F32 gpu_benchmark()
 	}
 	delete [] pixels;
 
+    delete [] pixels;
+
 	//make a dummy triangle to draw with
 	LLPointer<LLVertexBuffer> buff = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, GL_STATIC_DRAW_ARB);
 	buff->allocateBuffer(3, 0, true);
@@ -1096,7 +1098,16 @@ F32 gpu_benchmark()
 	F32 gbps = results[results.size()/2];
 
 	LL_INFOS() << "Memory bandwidth is " << llformat("%.3f", gbps) << "GB/sec according to CPU timers" << LL_ENDL;
-	
+  
+#if LL_DARWIN
+    if (gbps > 512.f)
+    { 
+        LL_INFOS() << "Memory bandwidth is improbably high and likely incorrect." << LL_ENDL;
+        //OSX is probably lying, discard result
+        gbps = -1.f;
+    }
+#endif
+
 	if (gGLManager.mHasTimerQuery)
 	{
 		F32 ms = gBenchmarkProgram.mTimeElapsed/1000000.f;

From 93796447c10cd2a80122efc6fcfe9b271b9f6005 Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Mon, 10 Nov 2014 23:47:15 -0800
Subject: [PATCH 105/229] MAINT-3131 code clean-up

---
 indra/newview/llglsandbox.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index f8ecdf0801..d0ad51eee1 100755
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -1013,7 +1013,6 @@ F32 gpu_benchmark()
 		gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, source[i]);
 		LLImageGL::setManualImage(GL_TEXTURE_2D, 0, GL_RGBA, res,res,GL_RGBA, GL_UNSIGNED_BYTE, pixels);
 	}
-	delete [] pixels;
 
     delete [] pixels;
 

From 75031c19368afa5727a6f86e5ca59c4dcd6c0a2d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 11 Nov 2014 10:13:20 +0100
Subject: [PATCH 106/229] Fix warning: "LLFeatureManager::applyFeatures: AHHH!
 Control setting WatchdogDisabled does not exist!"

---
 indra/newview/featuretable.txt         |  2 +-
 indra/newview/featuretable_mac.txt     |  2 +-
 indra/newview/featuretable_solaris.txt |  2 +-
 indra/newview/featuretable_xp.txt      |  2 +-
 indra/newview/llappviewer.cpp          | 27 ++++++++++++++------------
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 7b9418adaa..d96129da0a 100755
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -66,7 +66,7 @@ RenderShaderLightingMaxLevel	1	3
 RenderDeferred				1	1
 RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
-WatchdogDisabled				1	1
+//WatchdogDisabled				1	1
 RenderUseStreamVBO			1	1
 RenderFSAASamples			1	16
 RenderMaxTextureIndex		1	16
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 528cea9c6f..ae9938f38e 100755
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -66,7 +66,7 @@ RenderShaderLightingMaxLevel	1	3
 RenderDeferred				1	1
 RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
-WatchdogDisabled				1	1
+//WatchdogDisabled				1	1
 RenderUseStreamVBO			0	0
 RenderFSAASamples			1	16
 RenderMaxTextureIndex		1	16
diff --git a/indra/newview/featuretable_solaris.txt b/indra/newview/featuretable_solaris.txt
index e7cae1abdc..9eaf2ce765 100755
--- a/indra/newview/featuretable_solaris.txt
+++ b/indra/newview/featuretable_solaris.txt
@@ -41,7 +41,7 @@ VertexShaderEnable	1	1
 RenderTextureMemoryMultiple		1	1.0
 UseOcclusion		1       1
 RenderCubeMap		1       1
-WatchdogDisabled				1	1
+//WatchdogDisabled				1	1
 RenderUseFBO				1	1
 
 
diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt
index 14cc8b6ae3..cdf72ee460 100755
--- a/indra/newview/featuretable_xp.txt
+++ b/indra/newview/featuretable_xp.txt
@@ -66,7 +66,7 @@ RenderShaderLightingMaxLevel	1	3
 RenderDeferred				1	1
 RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
-WatchdogDisabled				1	1
+//WatchdogDisabled				1	1
 RenderUseStreamVBO			1	1
 RenderFSAASamples			1	16
 RenderMaxTextureIndex		1	16
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 61b3ba1743..17ada4df7b 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3717,19 +3717,22 @@ bool LLAppViewer::initWindow()
 	LL_INFOS("AppInit") << "gViewerwindow created." << LL_ENDL;
 
 	// Need to load feature table before cheking to start watchdog.
-	bool use_watchdog = false;
-	int watchdog_enabled_setting = gSavedSettings.getS32("WatchdogEnabled");
-	if (watchdog_enabled_setting == -1)
-	{
-		use_watchdog = !LLFeatureManager::getInstance()->isFeatureAvailable("WatchdogDisabled");
-	}
-	else
-	{
-		// The user has explicitly set this setting; always use that value.
-		use_watchdog = bool(watchdog_enabled_setting);
-	}
+	// <FS:Ansariel> Fix Watchdog settings/feature table mess
+	//bool use_watchdog = false;
+	//int watchdog_enabled_setting = gSavedSettings.getS32("WatchdogEnabled");
+	//if (watchdog_enabled_setting == -1)
+	//{
+	//	use_watchdog = !LLFeatureManager::getInstance()->isFeatureAvailable("WatchdogDisabled");
+	//}
+	//else
+	//{
+	//	// The user has explicitly set this setting; always use that value.
+	//	use_watchdog = bool(watchdog_enabled_setting);
+	//}
 
-	if (use_watchdog)
+	//if (use_watchdog)
+	if (gSavedSettings.getBOOL("WatchdogEnabled"))
+	// </FS:Ansariel>
 	{
 		LLWatchdog::getInstance()->init(watchdog_killer_callback);
 	}

From 0935abeaf3928b2f35ec9401336c3ceb49b7ff3e Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Tue, 11 Nov 2014 17:32:26 +0100
Subject: [PATCH 107/229] An option to turn off the use of CTRL, SHIFT and ALT
 keys in chat, in order to change message type into shout, whisper or OOC

---
 indra/newview/app_settings/settings.xml       | 11 +++++
 indra/newview/fsfloaternearbychat.cpp         |  2 +-
 indra/newview/fsnearbychatcontrol.cpp         | 43 +++++++++++--------
 .../default/xui/en/panel_preferences_chat.xml |  8 ++++
 .../default/xui/pl/panel_preferences_chat.xml |  1 +
 5 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d2b657ee90..0d254804fb 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -22811,6 +22811,17 @@ Change of this parameter will affect the layout of buttons in notification toast
         <key>Value</key>
         <integer>0</integer>
     </map>
+    <key>FSUseCtrlAltShiftForChatTypes</key>
+    <map>
+      <key>Comment</key>
+      <string>Use CTRL, SHIFT and ALT keys to change message type into shout, whisper or OOC</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
   </map>
 </llsd>
 
diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index 9029910243..411a4e6822 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -681,7 +681,7 @@ BOOL FSFloaterNearbyChat::handleKeyHere( KEY key, MASK mask )
 {
 	BOOL handled = FALSE;
 	
-	if (KEY_RETURN == key)
+	if (KEY_RETURN == key && gSavedSettings.getBOOL("FSUseCtrlAltShiftForChatTypes"))
 	{
 		if (mask == MASK_CONTROL)
 		{
diff --git a/indra/newview/fsnearbychatcontrol.cpp b/indra/newview/fsnearbychatcontrol.cpp
index d9bbff2c1a..43f19ec85d 100644
--- a/indra/newview/fsnearbychatcontrol.cpp
+++ b/indra/newview/fsnearbychatcontrol.cpp
@@ -357,25 +357,34 @@ BOOL FSNearbyChatControl::handleKeyHere(KEY key, MASK mask )
 	}
 	else if( KEY_RETURN == key )
 	{
-		if (mask == MASK_CONTROL)
+		if (gSavedSettings.getBOOL("FSUseCtrlAltShiftForChatTypes"))
 		{
-			// shout
-			type = CHAT_TYPE_SHOUT;
-			handled = TRUE;
+			if (mask == MASK_CONTROL)
+			{
+				// shout
+				type = CHAT_TYPE_SHOUT;
+				handled = TRUE;
+			}
+			else if (mask == MASK_SHIFT)
+			{
+				// whisper
+				type = CHAT_TYPE_WHISPER;
+				handled = TRUE;
+			}
+			else if (mask == MASK_ALT)
+			{
+				// OOC
+				type = CHAT_TYPE_OOC;
+				handled = TRUE;
+			}
+			else if (mask == MASK_NONE)
+			{
+				// say
+				type = CHAT_TYPE_NORMAL;
+				handled = TRUE;
+			}
 		}
-		else if (mask == MASK_SHIFT)
-		{
-			// whisper
-			type = CHAT_TYPE_WHISPER;
-			handled = TRUE;
-		}
-		else if (mask == MASK_ALT)
-		{
-			// OOC
-			type = CHAT_TYPE_OOC;
-			handled = TRUE;
-		}
-		else if (mask == MASK_NONE)
+		else
 		{
 			// say
 			type = CHAT_TYPE_NORMAL;
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 96ad9d520c..f18be020c2 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -196,6 +196,14 @@
              top_pad="1"
              height="16"
              width="400" />
+            <check_box
+             control_name="FSUseCtrlAltShiftForChatTypes"
+             name="FSUseCtrlAltShiftForChatTypes"
+             label="Use CTRL, SHIFT and ALT keys to change message type into shout, whisper or OOC"
+             layout="topleft"
+             top_pad="1"
+             height="16"
+             width="400" />
             <check_box
              control_name="FSIMSystemMessageBrackets"
              name="FSIMSystemMessageBrackets"
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index ecafc554bf..31427e67be 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -26,6 +26,7 @@
 			<check_box label="Powiadomienia o pisaniu do innych awatarów podczas sesji IM" name="FSSendTypingState"/>
 			<check_box label="Włącz autouzupełnianie gestów w pasku czatu lokalnego" name="FSChatbarGestureAutoCompleteEnable"/>
 			<check_box label="Włącz automatyczne odgadywanie imion w pasku czatu lokalnego" name="FSChatbarNamePrediction"/>
+			<check_box name="FSUseCtrlAltShiftForChatTypes" label="Używaj klawiszy CTRL, SHIFT i ALT, aby zmieniać typ wiadomości na krzyk, szept lub OOC"/>
 			<check_box name="FSIMSystemMessageBrackets" label="Pokazuj systemowe wiadomości czatu w nawiasach"/>
 			<check_box name="FSChatHistoryShowYou" label="Pokazuj &quot;Ty&quot; w logu czatu zamiast swojego imienia" />
 			<check_box name="IMShowNamesForP2PConv" label="Pokazuj imiona w bezpośrednich wiadomościach IM" />

From ff23ee673dddcecba4b96ad6205983b79328b11b Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 11 Nov 2014 21:58:51 +0100
Subject: [PATCH 108/229] Updated German translation

---
 indra/newview/skins/default/xui/de/panel_preferences_chat.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index b3bf661916..742e0b569c 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -27,6 +27,7 @@
 			<check_box label="Andere Avatare während IM-Sitzungen benachrichtigen, wenn ich schreibe" name="FSSendTypingState"/>
 			<check_box label="Auto-Vervollständigen für Gesten im Chat in der Nähe aktivieren" name="FSChatbarGestureAutoCompleteEnable"/>
 			<check_box label="Automatische Namensvorhersage in „Chat in der Nähe“-Eingabezeile aktivieren" name="FSChatbarNamePrediction"/>
+			<check_box label="STRG, UMSCHALT und ALT zum Rufen, Flüstern oder OOC verwenden" name="FSUseCtrlAltShiftForChatTypes"/>
 			<check_box label="Systemmeldungen in Klammern einschließen" name="FSIMSystemMessageBrackets"/>
 			<check_box label="Im Chatverlauf „Du“ anstatt des eigenen Namens anzeigen" name="FSChatHistoryShowYou"/>
 			<check_box label="Namen in direkten IMs anzeigen" name="IMShowNamesForP2PConv"/>

From a76b3d7c7d25ea1cd742a0fc4bdd6d7805afe45a Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Wed, 12 Nov 2014 19:45:21 +0100
Subject: [PATCH 109/229] Polish translation tune-up

---
 .../default/xui/pl/panel_nearby_media.xml     |  2 +-
 .../skins/default/xui/pl/panel_pick_info.xml  |  7 +++
 .../skins/default/xui/pl/panel_picks.xml      |  2 +-
 .../default/xui/pl/panel_place_profile.xml    | 13 +----
 .../xui/pl/panel_preferences_colors.xml       |  5 +-
 .../xui/pl/panel_preferences_general.xml      |  1 -
 .../xui/pl/panel_preferences_sound.xml        |  1 -
 .../default/xui/pl/panel_region_covenant.xml  |  6 ---
 .../default/xui/pl/panel_region_debug.xml     | 17 +++----
 .../default/xui/pl/panel_region_estate.xml    |  4 +-
 .../default/xui/pl/panel_teleport_history.xml |  4 +-
 .../default/xui/pl/panel_volume_pulldown.xml  |  1 -
 .../skins/default/xui/pl/panel_world_map.xml  | 48 -------------------
 .../default/xui/pl/sidepanel_appearance.xml   |  2 +-
 .../newview/skins/default/xui/pl/strings.xml  |  9 ----
 .../skins/default/xui/pl/teleport_strings.xml |  2 +-
 16 files changed, 25 insertions(+), 99 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml
index fa3f3f8ea3..5223d8dea5 100755
--- a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml
@@ -18,7 +18,7 @@
 	<panel name="minimized_controls">
 		<button label="Zatrzymaj" name="all_nearby_media_disable_btn" tool_tip="Wyłącz wszystkie media w pobliżu"/>
 		<button label="Włącz" name="all_nearby_media_enable_btn" tool_tip="Włącz wszystkie media w pobliżu"/>
-		<button name="open_prefs_btn" tool_tip="Uruchom preferencje mediów"/>
+		<button name="open_prefs_btn" tool_tip="Pokaż preferencje mediów"/>
 		<button label="Więcej &gt;&gt;" label_selected="&lt;&lt; Mniej" name="more_btn" tool_tip="Zaawansowane"/>
 	</panel>
 	<panel name="nearby_media_panel">
diff --git a/indra/newview/skins/default/xui/pl/panel_pick_info.xml b/indra/newview/skins/default/xui/pl/panel_pick_info.xml
index 16fc5975bd..58377acf17 100755
--- a/indra/newview/skins/default/xui/pl/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/pl/panel_pick_info.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_pick_info">
 	<text name="title" value="Info o Miejscu"/>
+	<scroll_container name="profile_scroll">
+		<panel name="scroll_content_panel">
+			<text_editor name="pick_name" value="[nazwa]" />
+			<text_editor name="pick_location" value="[wczytywanie...]" />
+			<text_editor name="pick_desc" value="[opis]" />
+		</panel>
+	</scroll_container>
 	<panel name="buttons">
 		<layout_stack name="layout_stack1">
 			<layout_panel name="layout_panel1">
diff --git a/indra/newview/skins/default/xui/pl/panel_picks.xml b/indra/newview/skins/default/xui/pl/panel_picks.xml
index 3630220f71..3528ccc50d 100755
--- a/indra/newview/skins/default/xui/pl/panel_picks.xml
+++ b/indra/newview/skins/default/xui/pl/panel_picks.xml
@@ -7,7 +7,7 @@
 		<panel name="tab_classifieds" title="Reklamy"/>
 	</tab_container>
 	<panel name="edit_panel">
-		<button name="new_btn" tool_tip="Tworzy nowe Miejsce lub reklamę w obecnej lokalizacji"/>
+		<button name="new_btn" tool_tip="Stwórz nowe Miejsce lub reklamę w obecnej lokalizacji"/>
 	</panel>
 	<panel name="buttons_cucks">
 		<layout_stack name="buttons_cucks_ls">
diff --git a/indra/newview/skins/default/xui/pl/panel_place_profile.xml b/indra/newview/skins/default/xui/pl/panel_place_profile.xml
index 23fba21743..571cf9130e 100755
--- a/indra/newview/skins/default/xui/pl/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/pl/panel_place_profile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="place_profile">
-	<string name="on" value="Włącz"/>
-	<string name="off" value="Wyłącz"/>
+	<string name="on" value="Włączone"/>
+	<string name="off" value="Wyłączone"/>
 	<string name="anyone" value="Każdy"/>
 	<string name="available" value="dostępny"/>
 	<string name="allocated" value="przydzielony"/>
@@ -48,21 +48,13 @@
 				<accordion_tab name="parcel_characteristics_tab" title="Działka">
 					<panel name="parcel_characteristics_panel">
 						<text name="rating_label" value="Rodzaj:"/>
-						<text name="rating_value" value="nieznany"/>
 						<text name="voice_label" value="Kom. głosowa:"/>
-						<text name="voice_value" value="Włączona"/>
 						<text name="fly_label" value="Latanie:"/>
-						<text name="fly_value" value="Włączone"/>
 						<text name="push_label" value="Popchnięcia:"/>
-						<text name="push_value" value="Wyłączone"/>
 						<text name="build_label" value="Budowanie:"/>
-						<text name="build_value" value="Włączone"/>
 						<text name="scripts_label" value="Skrypty:"/>
-						<text name="scripts_value" value="Włączone"/>
 						<text name="damage_label" value="Uszkodzenia:"/>
-						<text name="damage_value" value="Wyłączone"/>
 						<text name="see_avatars_label" value="Inne awatary:"/>
-						<text name="see_avatars_value" value="Wyłączone"/>
 						<button label="O działce" name="about_land_btn"/>
 					</panel>
 				</accordion_tab>
@@ -70,7 +62,6 @@
 					<panel name="region_information_panel">
 						<text name="region_type_label" value="Typ:"/>
 						<text name="region_rating_label" value="Rodzaj:"/>
-						<text name="region_rating" value="Adult"/>
 						<text name="region_owner_label" value="Właściciel:"/>
 						<text name="region_group_label" value="Grupa:"/>
 						<button label="Region/Majątek" name="region_info_btn"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
index f69c230243..a0ef084c96 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
@@ -23,9 +23,6 @@
 			<text name="muted_label">
 				Wyciszeni
 			</text>
-			<text name="system_label">
-				System
-			</text>
 			<text name="script_error_label">
 				Błędy skryptów
 			</text>
@@ -177,7 +174,7 @@
 				Tło/klr skryptów
 			</text>
 			<text name="floater_opacity">
-				Przezroczystość pływającego okna:
+				Przezroczystość okna:
 			</text>
 			<slider label="Aktywne:" name="active"/>
 			<slider label="Nieaktywne:" name="inactive"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
index 66a471d734..39156eedb1 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
@@ -27,7 +27,6 @@
 	<combo_box name="maturity_desired_combobox">
 		<combo_box.item label="General, Moderate oraz Adult" name="Desired_Adult"/>
 		<combo_box.item label="General oraz Moderate" name="Desired_Mature"/>
-		<combo_box.item label="General" name="Desired_PG"/>
 	</combo_box>
 	<text name="start_location_textbox">
 		Miejsce Startu:
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
index bf978157d9..8a1b1db66a 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
@@ -14,7 +14,6 @@
 			<check_box name="gesture_audio_play_btn" tool_tip="Zaznacz, aby słyszeć dźwięki gestów" label="Odtwarzaj dźwięki gestów"/>
 			<slider label="Muz. strumieniowa" name="Music Volume"/>
 			<check_box label="Włączona" name="enable_music"/>
-			<slider label="Media" name="Media Volume"/>
 			<check_box label="Włączone" name="enable_media"/>
 			<slider label="Rozmowy głosowe" name="Voice Volume"/>
 			<check_box label="Włączone" name="enable_voice_check_volume"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
index 3dd869d3f6..cf392d1290 100755
--- a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
@@ -49,15 +49,9 @@ wszystkich działkach majątku.
 	<text name="region_landtype_lbl">
 		Typ:
 	</text>
-	<text name="region_landtype_text">
-		Region Główny / Ziemia
-	</text>
 	<text name="region_maturity_lbl">
 		Rodzaj:
 	</text>
-	<text name="region_maturity_text">
-		Adult
-	</text>
 	<text name="resellable_lbl">
 		Odsprzedaż:
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_debug.xml b/indra/newview/skins/default/xui/pl/panel_region_debug.xml
index 2e66b6626c..70b0eea0dd 100755
--- a/indra/newview/skins/default/xui/pl/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_debug.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Debugowanie" name="Debug">
-	<text name="region_text_lbl">
-		Region:
-	</text>
 	<text name="region_text">
 		brak danych
 	</text>
-	<check_box label="Wyłącz skrypty" name="disable_scripts_check" tool_tip="Wyłącz wszystkie skrypty w tym Regionie"/>
-	<check_box label="Wyłącz kolizje" name="disable_collisions_check" tool_tip="Wyłącz kolizje obiektów (nie awatarów) w tym Regionie"/>
-	<check_box label="Wyłącz fizykę" name="disable_physics_check" tool_tip="Wyłącz wpływ fizyki w tym Regionie"/>
+	<check_box label="Wyłącz skrypty" name="disable_scripts_check" tool_tip="Wyłącz wszystkie skrypty w tym regionie"/>
+	<check_box label="Wyłącz kolizje" name="disable_collisions_check" tool_tip="Wyłącz kolizje obiektów (nie awatarów) w tym regionie"/>
+	<check_box label="Wyłącz fizykę" name="disable_physics_check" tool_tip="Wyłącz wpływ fizyki w tym regionie"/>
 	<button label="Zastosuj" name="apply_btn"/>
 	<text name="objret_text_lbl">
-		Zwrot obiektu
+		Zwrot obiektów
 	</text>
 	<text name="resident_text_lbl">
 		Rezydent:
@@ -26,13 +23,13 @@
 	<check_box label="Ze skryptami" name="return_scripts" tool_tip="Odeślij wyłącznie obiekty ze skryptami"/>
 	<check_box label="Wyłącznie obiekty, które są na działkach innych osób" name="return_other_land" tool_tip="Odeślij wyłącznie obiekty, które są na działkach innych osób"/>
 	<check_box label="W każdym regionie tego majątku" name="return_estate_wide" tool_tip="Odeślij obiekty z wszystkich regionów w tym majątku"/>
-	<button label="Odeślij" name="return_btn"/>
+	<button label="Zwróć" name="return_btn"/>
 	<button label="Szczytowe kolizje" name="top_colliders_btn" tool_tip="Lista obiektów doświadczających najwięcej potencjalnych kolizji"/>
 	<button label="Szczytowe skrypty" name="top_scripts_btn" tool_tip="Lista obiektów najdłużej wykonujących skrypty"/>
-	<button label="Restart Regionu" name="restart_btn" tool_tip="Odliczanie i restart Regionu za dwie minuty"/>
+	<button label="Restart regionu" name="restart_btn" tool_tip="Odliczanie i restart regionu za dwie minuty"/>
 	<text name="label_restart_delay">
 		Sekundy:
 	</text>
-	<button label="Anuluj restart" name="cancel_restart_btn" tool_tip="Anuluj restart Regionu"/>
+	<button label="Anuluj restart" name="cancel_restart_btn" tool_tip="Anuluj restart regionu"/>
 	<button label="Debugowanie regionu" name="region_debug_console_btn" tool_tip="Otwórz konsolę debugowania regionu"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_estate.xml b/indra/newview/skins/default/xui/pl/panel_region_estate.xml
index e037232c61..296098d8f5 100755
--- a/indra/newview/skins/default/xui/pl/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_estate.xml
@@ -22,8 +22,8 @@
 	<text name="Only Allow">
 		Dostęp tylko dla Rezydentów:
 	</text>
-	<check_box label="Z danymi płatniczymi na koncie" name="limit_payment" tool_tip="Tylko osoby z danymi płatniczymi na koncie mogą wejść na ten Majątek. Zobacz [SUPPORT_SITE] aby dowiedzieć się więcej."/>
-	<check_box label="Mają 18 lat lub więcej" name="limit_age_verified" tool_tip="Tylko osoby mające 18 lat lub więcej mogą wejść na ten Majątek. Zobacz [SUPPORT_SITE] aby dowiedzieć się więcej."/>
+	<check_box label="Zarejestrowanych w systemie płatniczym" name="limit_payment" tool_tip="Zbanuj Rezydentów niezarejestrowanych w systemie płatniczym Linden Lab. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji."/>
+	<check_box label="Którzy mają 18+ lat" name="limit_age_verified" tool_tip="Zbanuj Rezydetów, którzy mają mniej niż 18 lat. Odwiedź [SUPPORT_SITE], aby uzyskać więcej informacji."/>
 	<text name="estate_manager_label">
 		Zarządcy Majątku:
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
index b43bd96536..9129183e3d 100755
--- a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Teleport History">
 	<accordion name="history_accordion">
-		<no_matched_tabs_text name="no_matched_teleports_msg" value="Nie znaleziono tego czego szukasz? Spróbuj [secondlife:///app/search/places/[SEARCH_TERM] Szukaj]."/>
-		<no_visible_tabs_text name="no_teleports_msg" value="Historia teleportacji jest pusta. Spróbuj [secondlife:///app/search/places/ Szukaj]."/>
+		<no_matched_tabs_text name="no_matched_teleports_msg" value="Nie znaleziono tego czego szukasz? Spróbuj [secondlife:///app/search/places/[SEARCH_TERM] wyszukać]."/>
+		<no_visible_tabs_text name="no_teleports_msg" value="Historia teleportacji jest pusta. Spróbuj [secondlife:///app/search/places/ wyszukać]."/>
 		<accordion_tab name="today" title="Dzisiaj"/>
 		<accordion_tab name="yesterday" title="Wczoraj"/>
 		<accordion_tab name="2_days_ago" title="2 dni temu"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml
index 75e9292d77..ee308a77da 100755
--- a/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml
@@ -8,7 +8,6 @@
     <check_box name="gesture_audio_play_btn" tool_tip="Włącz dźwięki gestów"/>
     <slider label="Muzyka" name="Music Volume"/>
     <check_box tool_tip="Włącz muzykę strumieniową" name="enable_music"/>
-    <slider label="Media" name="Media Volume"/>
     <check_box tool_tip="Włącz media strumieniowe" name="enable_media"/>
     <slider label="Głos" name="Voice Volume"/>
     <check_box tool_tip="Włącz rozmowy głosowe" name="enable_voice_check"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_world_map.xml b/indra/newview/skins/default/xui/pl/panel_world_map.xml
index 69f18be767..385dfa6fa9 100755
--- a/indra/newview/skins/default/xui/pl/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/pl/panel_world_map.xml
@@ -6,58 +6,10 @@
 	<panel.string name="InvalidLocation">
 		Niewłaściwa lokalizacja
 	</panel.string>
-	<panel.string name="world_map_north">
-		N
-	</panel.string>
-	<panel.string name="world_map_east">
-		E
-	</panel.string>
-	<panel.string name="world_map_west">
-		W
-	</panel.string>
-	<panel.string name="world_map_south">
-		S
-	</panel.string>
-	<panel.string name="world_map_southeast">
-		SE
-	</panel.string>
-	<panel.string name="world_map_northeast">
-		NE
-	</panel.string>
-	<panel.string name="world_map_southwest">
-		SW
-	</panel.string>
-	<panel.string name="world_map_northwest">
-		NW
-	</panel.string>
 	<panel.string name="world_map_person">
 		1 osoba
 	</panel.string>
 	<panel.string name="world_map_people">
 		[NUMBER] ludzi
 	</panel.string>
-	<text label="N" name="floater_map_north" text="N">
-		N
-	</text>
-	<text label="E" name="floater_map_east" text="E">
-		E
-	</text>
-	<text label="W" name="floater_map_west" text="W">
-		W
-	</text>
-	<text label="S" name="floater_map_south" text="S">
-		S
-	</text>
-	<text label="SE" name="floater_map_southeast" text="SE">
-		SE
-	</text>
-	<text label="NE" name="floater_map_northeast" text="NE">
-		NE
-	</text>
-	<text label="SW" name="floater_map_southwest" text="SW">
-		SW
-	</text>
-	<text label="NW" name="floater_map_northwest" text="NW">
-		NW
-	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
index 55ee35ca54..0f3a18e8e4 100755
--- a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Stroje" name="appearance panel">
-	<string name="No Outfit" value="Bez stroju"/>
+	<string name="No Outfit" value="Brak stroju"/>
 	<string name="Unsaved Changes" value="Zmiany niezachowane"/>
 	<string name="Now Wearing" value="Obecnie założone..."/>
 	<string name="Changing outfits" value="Zmiana stroju"/>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 4d3413a767..e089e0a6ff 100755
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -1065,15 +1065,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="UnknownScriptPermission">
 		(nieznane)!
 	</string>
-	<string name="SIM_ACCESS_PG">
-		General
-	</string>
-	<string name="SIM_ACCESS_MATURE">
-		Moderate
-	</string>
-	<string name="SIM_ACCESS_ADULT">
-		Adult
-	</string>
 	<string name="SIM_ACCESS_DOWN">
 		Niedostępny
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/teleport_strings.xml b/indra/newview/skins/default/xui/pl/teleport_strings.xml
index 690da8de1f..a7bc7af8e5 100755
--- a/indra/newview/skins/default/xui/pl/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pl/teleport_strings.xml
@@ -21,7 +21,7 @@ Jeśli nadal nie możesz się teleportować wyloguj się i ponownie zaloguj.
 Spróbuj jeszcze raz.
 		</message>
 		<message name="NoHelpIslandTP">
-		Brak możliwości ponownej teleportacji do Welcome Island.
+			Brak możliwości ponownej teleportacji do Welcome Island.
 Odwiedź &apos;Welcome Island Public&apos; by powtórzyć szkolenie.
 		</message>
 		<message name="noaccess_tport">

From 3e8f5e1029d02367d27593c891df18cd1589c39e Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Thu, 13 Nov 2014 19:17:19 +0100
Subject: [PATCH 110/229] Typo fix (Lightning to Lighting)

---
 indra/newview/skins/default/xui/en/strings.xml       | 2 +-
 indra/newview/skins/default/xui/es/floater_about.xml | 2 +-
 indra/newview/skins/default/xui/pl/strings.xml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3ff68446a4..e31850cded 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -65,7 +65,7 @@ Draw distance: [DRAW_DISTANCE]
 Bandwidth: [BANDWIDTH]
 LOD factor: [LOD]
 Render quality: [RENDERQUALITY]
-Advanced Lightning Model: [ALMSTATUS]
+Advanced Lighting Model: [ALMSTATUS]
 Texture memory: [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
 VFS (cache) creation time (UTC): [VFS_DATE]
   </string>
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 06b6c29a91..f279fff16b 100755
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -35,7 +35,7 @@ Distancia de dibujo (Draw distance): [DRAW_DISTANCE]
 Ancho de banda (Bandwidth): [BANDWIDTH]
 Factor de nivel de detalle (LOD factor): [LOD]
 Calidad de dibujo (Render quality): [RENDERQUALITY]
-Advanced Lightning Model: [ALMSTATUS]
+Advanced Lighting Model: [ALMSTATUS]
 Memoria de texturas (Texture memory): [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
 	</floater.string>
 	<floater.string name="none">
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index e089e0a6ff..2fd1e1bf0d 100755
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -62,7 +62,7 @@ Pole widzenia (Draw Distance): [DRAW_DISTANCE]
 Przepustowość (Bandwidth): [BANDWIDTH]
 Mnożnik poziomu detali (LOD Factor): [LOD]
 Jakość wyświetlania (Render quality): [RENDERQUALITY]
-Zaawansowane oświetlenie (Advanced Lightning Model): [ALMSTATUS]
+Zaawansowane oświetlenie (Advanced Lighting Model): [ALMSTATUS]
 Pamięć tekstur (Texture memory): [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
 Czas utworzenia VFS (cache) w UTC: [VFS_DATE]
 	</string>

From 6c6063a0b810905562c27b6e7fd59873b27418fe Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 14 Nov 2014 11:49:54 +0100
Subject: [PATCH 111/229] Fix muted avatars re-rezzing if RenderUnloadedAvatar
 and ShowMutedAvatarsAsCloud both are true

---
 indra/newview/llvoavatar.cpp | 46 ++++++++++++++++++++++++------------
 indra/newview/llvoavatar.h   |  3 +++
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 658a1b6d5b..18ca3c68f5 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -690,6 +690,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
 	mTyping(FALSE),
 	mMeshValid(FALSE),
 	mVisible(FALSE),
+	mMutedAsCloud(false), // <FS:Ansariel> Show muted avatars as cloud
 	mWindFreq(0.f),
 	mRipplePhase( 0.f ),
 	mBelowWater(FALSE),
@@ -2196,6 +2197,11 @@ void LLVOAvatar::idleUpdate(LLAgent &agent, const F64 &time)
 
 	// attach objects that were waiting for a drawable
 	lazyAttach();
+
+	// <FS:Ansariel> Show muted avatars as cloud
+	static LLUICachedControl<bool> showMutedAvatarsAsCloud("ShowMutedAvatarsAsCloud", false);
+	mMutedAsCloud = !isSelf() && showMutedAvatarsAsCloud && LLMuteList::instance().isMuted(getID());
+	// </FS:Ansariel>
 	
 	// animate the character
 	// store off last frame's root position to be consistent with camera position
@@ -2594,7 +2600,7 @@ void LLVOAvatar::idleUpdateLoadingEffect()
 		}
 		else
 		{
-// [ LL Default Av Clouds ]
+// <FS> Custom avatar particle cloud
 //			LLPartSysData particle_parameters;
 //
 //			// fancy particle cloud designed by Brent
@@ -2629,15 +2635,18 @@ void LLVOAvatar::idleUpdateLoadingEffect()
 
 			// Firestorm Clouds
 			if (!isTooComplex()) // do not generate particles for overly-complex avatars
-            {
-                if (!isSelf() && LLMuteList::getInstance()->isMuted(getID()))
-                    setParticleSource(sCloudMuted, getID());
-                else
-                    setParticleSource(sCloud, getID());
-            }
-
-
+			{
+				if (mMutedAsCloud)
+				{
+					setParticleSource(sCloudMuted, getID());
+				}
+				else
+				{
+					setParticleSource(sCloud, getID());
+				}
+			}
 		}
+// </FS>
 	}
 }	
 
@@ -6625,8 +6634,6 @@ BOOL LLVOAvatar::isVisible() const
 // Determine if we have enough avatar data to render
 BOOL LLVOAvatar::getIsCloud() const
 {
-	static LLUICachedControl<bool> muted_as_cloud("ShowMutedAvatarsAsCloud");
-	
 	// Do we have a shape?
 	if ((const_cast<LLVOAvatar*>(this))->visualParamWeightsAreDefault())
 	{
@@ -6640,10 +6647,12 @@ BOOL LLVOAvatar::getIsCloud() const
 		return TRUE;
 	}
 
-	if (muted_as_cloud && !isSelf() &&  LLMuteList::getInstance()->isMuted(getID()))
+	// <FS> Show muted avatars as cloud
+	if (mMutedAsCloud)
 	{
 		return TRUE;
 	}
+	// </FS>
 	
 	if (isTooComplex())
 	{
@@ -6674,7 +6683,10 @@ void LLVOAvatar::updateRezzedStatusTimers()
 				startPhase("first_load_" + LLVOAvatar::rezStatusToString(i));
 			}
 		}
-		if (rez_status < mLastRezzedStatus)
+		// <FS:Ansariel> Show muted avatars as cloud
+		//if (rez_status < mLastRezzedStatus)
+		if (rez_status < mLastRezzedStatus && !mMutedAsCloud)
+		// </FS:Ansariel>
 		{
 			// load level has decreased. start phase timers for higher load levels.
 			for (S32 i = rez_status+1; i <= mLastRezzedStatus; i++)
@@ -6834,7 +6846,10 @@ BOOL LLVOAvatar::updateIsFullyLoaded()
 
 void LLVOAvatar::updateRuthTimer(bool loading)
 {
-	if (isSelf() || !loading) 
+	// <FS:Ansariel> Show muted avatars as cloud
+	//if (isSelf() || !loading) 
+	if (isSelf() || !loading || !mMutedAsCloud) 
+	// </FS:Ansariel>
 	{
 		return;
 	}
@@ -6896,7 +6911,8 @@ BOOL LLVOAvatar::isFullyLoaded() const
 //	return (mRenderUnloadedAvatar || mFullyLoaded);
 // [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-09-22 (Catznip-2.2)
 	// Changes to LLAppearanceMgr::updateAppearanceFromCOF() expect this function to actually return mFullyLoaded for gAgentAvatarp
-	return (mRenderUnloadedAvatar && !isSelf()) ||(mFullyLoaded);
+	//return (mRenderUnloadedAvatar && !isSelf()) ||(mFullyLoaded);
+	return (mRenderUnloadedAvatar && !isSelf() && !mMutedAsCloud) ||(mFullyLoaded); // Particle clouds!
 // [/SL:KB]
 }
 
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 8f991c4fa3..0ae8120018 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -236,6 +236,9 @@ public:
 private: //aligned members
 	LL_ALIGN_16(LLVector4a	mImpostorExtents[2]);
 
+	// <FS:Ansariel> Show muted avatars as cloud
+	bool			mMutedAsCloud;
+
 	//--------------------------------------------------------------------
 	// Updates
 	//--------------------------------------------------------------------

From 1a5e7d53c1125bbaf6d1f791a355648d04ed663d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 14 Nov 2014 13:14:54 +0100
Subject: [PATCH 112/229] FIRE-11783 / BUG-4020 / MAINT-3240: Always visually
 mute avatars that are muted independent from RenderAutoMuteFunctions setting

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

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 18ca3c68f5..fcd1b16249 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3446,6 +3446,13 @@ bool LLVOAvatar::isVisuallyMuted()
 {
 	bool muted = false;
 
+	// <FS:Ansariel> FIRE-11783: Always visually mute avatars that are muted
+	if (!isSelf() && LLMuteList::instance().isMuted(getID()))
+	{
+		return true;
+	}
+	// </FS:Ansariel>
+
 	if (!isSelf())
 	{
 		static LLCachedControl<U32> render_auto_mute_functions(gSavedSettings, "RenderAutoMuteFunctions", 0);
@@ -3485,7 +3492,7 @@ bool LLVOAvatar::isVisuallyMuted()
 
 					U32 max_cost = (U32) (max_render_cost*(LLVOAvatar::sLODFactor+0.5));
 
-					muted = LLMuteList::getInstance()->isMuted(getID()) ||
+					muted = /*LLMuteList::getInstance()->isMuted(getID()) ||*/ // <FS:Ansariel> FIRE-11783: Always visually mute avatars that are muted
 						(mAttachmentGeometryBytes > max_attachment_bytes && max_attachment_bytes > 0) ||
 						(mAttachmentSurfaceArea > max_attachment_area && max_attachment_area > 0.f) ||
 						(mVisualComplexity > max_cost && max_render_cost > 0);

From 69ee044740918daa7301c67b37a13d083870fd16 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 14 Nov 2014 20:01:15 +0100
Subject: [PATCH 113/229] Cleaning up the animation explorer a bit

---
 indra/newview/animationexplorer.cpp | 246 ++++++++++++++--------------
 indra/newview/animationexplorer.h   |   6 +-
 2 files changed, 126 insertions(+), 126 deletions(-)

diff --git a/indra/newview/animationexplorer.cpp b/indra/newview/animationexplorer.cpp
index f62b206580..6d41d59249 100644
--- a/indra/newview/animationexplorer.cpp
+++ b/indra/newview/animationexplorer.cpp
@@ -70,43 +70,43 @@ void RecentAnimationList::addAnimation(const LLUUID& id, const LLUUID& playedBy)
 {
 	AnimationEntry entry;
 
-	entry.animationID=id;
-	entry.playedBy=playedBy;
-	entry.time=LLTimer::getElapsedSeconds();
+	entry.animationID = id;
+	entry.playedBy = playedBy;
+	entry.time = LLTimer::getElapsedSeconds();
 
-	AnimationExplorer* explorer=LLFloaterReg::findTypedInstance<AnimationExplorer>("animation_explorer");
+	AnimationExplorer* explorer = LLFloaterReg::findTypedInstance<AnimationExplorer>("animation_explorer");
 
 	// only remember animation when it wasn't played by ourselves or the explorer window is open,
 	// so the list doesn't get polluted
-	if(playedBy!=gAgentAvatarp->getID() || explorer!=NULL)
+	if (playedBy != gAgentAvatarp->getID() || explorer != NULL)
 	{
 		mAnimationList.push_back(entry);
 
 		// only keep a certain number of entries
-		if(mAnimationList.size()>MAX_ANIMATIONS)
+		if (mAnimationList.size() > MAX_ANIMATIONS)
 		{
 			mAnimationList.pop_front();
 		}
 	}
 
 	// if the animation explorer floater is open, send this animation over immediately
-	if(explorer)
+	if (explorer)
 	{
-		explorer->addAnimation(id,playedBy,LLTimer::getElapsedSeconds());
+		explorer->addAnimation(id, playedBy, LLTimer::getElapsedSeconds());
 	}
 }
 
 void RecentAnimationList::requestList(AnimationExplorer* explorer)
 {
-	if(explorer)
+	if (explorer)
 	{
 		// send the list of recent animations to the given animation explorer floater
-		for(std::deque<AnimationEntry>::iterator iter=mAnimationList.begin();
-			iter!=mAnimationList.end();
+		for (std::deque<AnimationEntry>::iterator iter = mAnimationList.begin();
+			iter != mAnimationList.end();
 			++iter)
 		{
-			AnimationEntry entry=*iter;
-			explorer->addAnimation(entry.animationID,entry.playedBy,entry.time);
+			AnimationEntry entry = *iter;
+			explorer->addAnimation(entry.animationID, entry.playedBy, entry.time);
 		}
 	}
 }
@@ -123,45 +123,45 @@ AnimationExplorer::AnimationExplorer(const LLSD& key)
 
 AnimationExplorer::~AnimationExplorer()
 {
-	mAnimationPreview=NULL;
+	mAnimationPreview = NULL;
 }
 
 void AnimationExplorer::startMotion(const LLUUID& motionID)
 {
-	if(!mAnimationPreview)
+	if (!mAnimationPreview)
 	{
 		return;
 	}
 
-	LLVOAvatar* avatarp=mAnimationPreview->getDummyAvatar();
+	LLVOAvatar* avatarp = mAnimationPreview->getDummyAvatar();
 
 	avatarp->deactivateAllMotions();
-	avatarp->startMotion(ANIM_AGENT_STAND,0.0f);
+	avatarp->startMotion(ANIM_AGENT_STAND, 0.0f);
 
-	if(motionID.notNull())
+	if (motionID.notNull())
 	{
-		avatarp->startMotion(motionID,0.0f);
+		avatarp->startMotion(motionID, 0.0f);
 	}
 }
 
 BOOL AnimationExplorer::postBuild()
 {
-	mAnimationScrollList=getChild<LLScrollListCtrl>("animation_list");
-	mStopButton=getChild<LLButton>("stop_btn");
-	mRevokeButton=getChild<LLButton>("revoke_btn");
-	mStopAndRevokeButton=getChild<LLButton>("stop_and_revoke_btn");
-	mNoOwnedAnimationsCheckBox=getChild<LLCheckBoxCtrl>("no_owned_animations_check");
+	mAnimationScrollList = getChild<LLScrollListCtrl>("animation_list");
+	mStopButton = getChild<LLButton>("stop_btn");
+	mRevokeButton = getChild<LLButton>("revoke_btn");
+	mStopAndRevokeButton = getChild<LLButton>("stop_and_revoke_btn");
+	mNoOwnedAnimationsCheckBox = getChild<LLCheckBoxCtrl>("no_owned_animations_check");
 
-	mAnimationScrollList->setCommitCallback(boost::bind(&AnimationExplorer::onSelectAnimation,this));
-	mStopButton->setCommitCallback(boost::bind(&AnimationExplorer::onStopPressed,this));
-	mRevokeButton->setCommitCallback(boost::bind(&AnimationExplorer::onRevokePressed,this));
-	mStopAndRevokeButton->setCommitCallback(boost::bind(&AnimationExplorer::onStopAndRevokePressed,this));
-	mNoOwnedAnimationsCheckBox->setCommitCallback(boost::bind(&AnimationExplorer::onOwnedCheckToggled,this));
+	mAnimationScrollList->setCommitCallback(boost::bind(&AnimationExplorer::onSelectAnimation, this));
+	mStopButton->setCommitCallback(boost::bind(&AnimationExplorer::onStopPressed, this));
+	mRevokeButton->setCommitCallback(boost::bind(&AnimationExplorer::onRevokePressed, this));
+	mStopAndRevokeButton->setCommitCallback(boost::bind(&AnimationExplorer::onStopAndRevokePressed, this));
+	mNoOwnedAnimationsCheckBox->setCommitCallback(boost::bind(&AnimationExplorer::onOwnedCheckToggled, this));
 
-	mPreviewCtrl=findChild<LLView>("animation_preview");
-	if(mPreviewCtrl)
+	mPreviewCtrl = findChild<LLView>("animation_preview");
+	if (mPreviewCtrl)
 	{
-		mAnimationPreview=new LLPreviewAnimation(
+		mAnimationPreview = new LLPreviewAnimation(
 			mPreviewCtrl->getRect().getWidth(),mPreviewCtrl->getRect().getHeight()
 		);
 		mAnimationPreview->setZoom(2.0f);
@@ -180,37 +180,37 @@ BOOL AnimationExplorer::postBuild()
 
 void AnimationExplorer::onSelectAnimation()
 {
-	LLScrollListItem* item=mAnimationScrollList->getFirstSelected();
-	if(!item)
+	LLScrollListItem* item = mAnimationScrollList->getFirstSelected();
+	if (!item)
 	{
 		return;
 	}
 
-	S32 column=mAnimationScrollList->getColumn("animation_id")->mIndex;
-	mCurrentAnimationID=item->getColumn(column)->getValue().asUUID();
+	S32 column = mAnimationScrollList->getColumn("animation_id")->mIndex;
+	mCurrentAnimationID = item->getColumn(column)->getValue().asUUID();
 
-	column=mAnimationScrollList->getColumn("played_by")->mIndex;
-	mCurrentObject=item->getColumn(column)->getValue().asUUID();
+	column = mAnimationScrollList->getColumn("played_by")->mIndex;
+	mCurrentObject = item->getColumn(column)->getValue().asUUID();
 
 	startMotion(mCurrentAnimationID);
 }
 
 void AnimationExplorer::onStopPressed()
 {
-	if(mCurrentAnimationID.notNull())
+	if (mCurrentAnimationID.notNull())
 	{
 		gAgentAvatarp->stopMotion(mCurrentAnimationID);
-		gAgent.sendAnimationRequest(mCurrentAnimationID,ANIM_REQUEST_STOP);
+		gAgent.sendAnimationRequest(mCurrentAnimationID, ANIM_REQUEST_STOP);
 	}
 }
 
 void AnimationExplorer::onRevokePressed()
 {
-	if(mCurrentObject.notNull())
+	if (mCurrentObject.notNull())
 	{
-		LLViewerObject* vo=gObjectList.findObject(mCurrentObject);
+		LLViewerObject* vo = gObjectList.findObject(mCurrentObject);
 
-		if(vo)
+		if (vo)
 		{
 			gAgentAvatarp->revokePermissionsOnObject(vo);
 		}
@@ -232,35 +232,35 @@ void AnimationExplorer::onOwnedCheckToggled()
 void AnimationExplorer::draw()
 {
 	LLFloater::draw();
-	LLRect r=mPreviewCtrl->getRect();
+	LLRect r = mPreviewCtrl->getRect();
 
-	if(mAnimationPreview)
+	if (mAnimationPreview)
 	{
 		mAnimationPreview->requestUpdate();
 
-		gGL.color3f(1.0f,1.0f,1.0f);
+		gGL.color3f(1.0f, 1.0f, 1.0f);
 		gGL.getTexUnit(0)->bind(mAnimationPreview);
 		gGL.begin(LLRender::QUADS);
 		{
-			gGL.texCoord2f(0.0f,1.0f);
-			gGL.vertex2i(r.mLeft,r.mTop);
-			gGL.texCoord2f(0.0f,0.0f);
-			gGL.vertex2i(r.mLeft,r.mBottom);
-			gGL.texCoord2f(1.0f,0.0f);
-			gGL.vertex2i(r.mRight,r.mBottom);
-			gGL.texCoord2f(1.0f,1.0f);
-			gGL.vertex2i(r.mRight,r.mTop);
+			gGL.texCoord2f(0.0f, 1.0f);
+			gGL.vertex2i(r.mLeft, r.mTop);
+			gGL.texCoord2f(0.0f, 0.0f);
+			gGL.vertex2i(r.mLeft, r.mBottom);
+			gGL.texCoord2f(1.0f, 0.0f);
+			gGL.vertex2i(r.mRight, r.mBottom);
+			gGL.texCoord2f(1.0f, 1.0f);
+			gGL.vertex2i(r.mRight, r.mTop);
 		}
 		gGL.end();
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 	}
 
 	// update tiems and "Still playing" status in the list once every few seconds
-	static F64 last_update=0.0f;
-	F64 time=LLTimer::getElapsedSeconds();
-	if(time-last_update>5.0f)
+	static F64 last_update = 0.0f;
+	F64 time = LLTimer::getElapsedSeconds();
+	if (time-last_update > 5.0f)
 	{
-		last_update=time;
+		last_update = time;
 		updateList(time);
 	}
 }
@@ -276,58 +276,58 @@ void AnimationExplorer::update()
 
 void AnimationExplorer::updateList(F64 current_timestamp)
 {
-	S32 played_column=mAnimationScrollList->getColumn("played")->mIndex;
-	S32 timestamp_column=mAnimationScrollList->getColumn("timestamp")->mIndex;
-	S32 object_id_column=mAnimationScrollList->getColumn("object_id")->mIndex;
-	S32 anim_id_column=mAnimationScrollList->getColumn("animation_id")->mIndex;
+	S32 played_column = mAnimationScrollList->getColumn("played")->mIndex;
+	S32 timestamp_column = mAnimationScrollList->getColumn("timestamp")->mIndex;
+	S32 object_id_column = mAnimationScrollList->getColumn("object_id")->mIndex;
+	S32 anim_id_column = mAnimationScrollList->getColumn("animation_id")->mIndex;
 
 	// go through the full animation scroll list
-	std::vector<LLScrollListItem*> items=mAnimationScrollList->getAllData();
-	for (std::vector<LLScrollListItem*>::iterator list_iter=items.begin();list_iter!=items.end();++list_iter)
+	std::vector<LLScrollListItem*> items = mAnimationScrollList->getAllData();
+	for (std::vector<LLScrollListItem*>::iterator list_iter = items.begin(); list_iter != items.end(); ++list_iter)
 	{
-		LLScrollListItem* item=*list_iter;
+		LLScrollListItem* item = *list_iter;
 
 		// get a pointer to the "Played" column text
-		LLScrollListText* played_text=(LLScrollListText*) item->getColumn(played_column);
+		LLScrollListText* played_text = (LLScrollListText*)item->getColumn(played_column);
 
 		// get the object ID from the list
-		LLUUID object_id=item->getColumn(object_id_column)->getValue().asUUID();
+		LLUUID object_id = item->getColumn(object_id_column)->getValue().asUUID();
 
 		// assume this animation is not running first
-		bool is_running=false;
+		bool is_running = false;
 
 		// go through the list of playing animations to find out if this animation played by
 		// this object is still running
-		for(LLVOAvatar::AnimSourceIterator anim_iter=gAgentAvatarp->mAnimationSources.begin();
-			anim_iter!=gAgentAvatarp->mAnimationSources.end();anim_iter++)
+		for (LLVOAvatar::AnimSourceIterator anim_iter = gAgentAvatarp->mAnimationSources.begin();
+			anim_iter != gAgentAvatarp->mAnimationSources.end(); ++anim_iter)
 		{
 			// object found
-			if(anim_iter->first==object_id)
+			if (anim_iter->first == object_id)
 			{
-				LLUUID anim_id=item->getColumn(anim_id_column)->getValue().asUUID();
+				LLUUID anim_id = item->getColumn(anim_id_column)->getValue().asUUID();
 
 				// animation found
-				if(anim_iter->second==anim_id)
+				if (anim_iter->second == anim_id)
 				{
 					// set text to "Still playing" and break out of this loop
 					played_text->setText(LLTrans::getString("animation_explorer_still_playing"));
-					is_running=true;
+					is_running = true;
 					break;
 				}
 			}
 		}
 
 		// animation was not found to be running
-		if(!is_running)
+		if (!is_running)
 		{
 			// get timestamp when this animation was started
-			F64 timestamp=item->getColumn(timestamp_column)->getValue().asReal();
+			F64 timestamp = item->getColumn(timestamp_column)->getValue().asReal();
 
 			// update text to show the number of seconds ago when this animation was started
 			LLStringUtil::format_map_t args;
-			args["SECONDS"]=llformat("%d",(S32) (current_timestamp-timestamp));
+			args["SECONDS"] = llformat("%d", (S32) (current_timestamp - timestamp));
 
-			played_text->setText(LLTrans::getString("animation_explorer_seconds_ago",args));
+			played_text->setText(LLTrans::getString("animation_explorer_seconds_ago", args));
 		}
 	}
 }
@@ -335,37 +335,37 @@ void AnimationExplorer::updateList(F64 current_timestamp)
 void AnimationExplorer::addAnimation(const LLUUID& id, const LLUUID& played_by, F64 time)
 {
 	// don't add animations that are played by ourselves when the filter box is checked
-	if(played_by==gAgentAvatarp->getID())
+	if (played_by == gAgentAvatarp->getID())
 	{
-		if(mNoOwnedAnimationsCheckBox->getValue().asBoolean())
+		if (mNoOwnedAnimationsCheckBox->getValue().asBoolean())
 		{
 			return;
 		}
 	}
 
 	// set object name to UUID at first
-	std::string playedByName=played_by.asString();
+	std::string playedByName = played_by.asString();
 
 	// find out if the object is still in reach
-	LLViewerObject* vo=gObjectList.findObject(played_by);
-	if(vo)
+	LLViewerObject* vo = gObjectList.findObject(played_by);
+	if (vo)
 	{
 		// if it was an avatar, get the name here
-		if(vo->isAvatar())
+		if (vo->isAvatar())
 		{
-			playedByName=std::string(vo->getNVPair("FirstName")->getString())+" "+
+			playedByName = std::string(vo->getNVPair("FirstName")->getString()) + " " +
 				std::string(vo->getNVPair("LastName")->getString());
 		}
 		// not an avatar, do a lookup by UUID
 		else
 		{
 			// find out if we know the name to this UUID already
-			std::map<LLUUID,std::string>::iterator iter=mKnownIDs.find(played_by);
+			std::map<LLUUID, std::string>::iterator iter = mKnownIDs.find(played_by);
 			// if we don't know it yet, start a lookup
-			if(iter==mKnownIDs.end())
+			if (iter == mKnownIDs.end())
 			{
 				// if we are not already looking up this object's name, send a request out
-				if(std::find(mRequestedIDs.begin(),mRequestedIDs.end(),played_by)==mRequestedIDs.end())
+				if (std::find(mRequestedIDs.begin(), mRequestedIDs.end(), played_by) == mRequestedIDs.end())
 				{
 					// remember which object names we already requested
 					mRequestedIDs.push_back(played_by);
@@ -374,86 +374,86 @@ void AnimationExplorer::addAnimation(const LLUUID& id, const LLUUID& played_by,
 					
 					msg->newMessageFast(_PREHASH_ObjectSelect);
 					msg->nextBlockFast(_PREHASH_AgentData);
-					msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-					msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+					msg->addUUIDFast(_PREHASH_AgentID, gAgentID);
+					msg->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
 					msg->nextBlockFast(_PREHASH_ObjectData);
-					msg->addU32Fast(_PREHASH_ObjectLocalID,vo->getLocalID());
+					msg->addU32Fast(_PREHASH_ObjectLocalID, vo->getLocalID());
 					msg->sendReliable(gAgentAvatarp->getRegion()->getHost());
 
 					msg->newMessageFast(_PREHASH_ObjectDeselect);
 					msg->nextBlockFast(_PREHASH_AgentData);
-					msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-					msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+					msg->addUUIDFast(_PREHASH_AgentID, gAgentID);
+					msg->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
 					msg->nextBlockFast(_PREHASH_ObjectData);
-					msg->addU32Fast(_PREHASH_ObjectLocalID,vo->getLocalID());
+					msg->addU32Fast(_PREHASH_ObjectLocalID, vo->getLocalID());
 					msg->sendReliable(gAgentAvatarp->getRegion()->getHost());
 				}
 			}
 			else
 			{
 				// we know the name already
-				playedByName=mKnownIDs[played_by];
+				playedByName = mKnownIDs[played_by];
 			}
 		}
 	}
 
 	// insert the item into the scroll list
 	LLSD item;
-	item["columns"][0]["column"]="played_by";
-	item["columns"][0]["value"]=playedByName;
-	item["columns"][1]["column"]="played";
-	item["columns"][1]["value"]=LLTrans::getString("animation_explorer_still_playing");
-	item["columns"][2]["column"]="timestamp";
-	item["columns"][2]["value"]=time;
-	item["columns"][3]["column"]="animation_id";
-	item["columns"][3]["value"]=id;
-	item["columns"][4]["column"]="object_id";
-	item["columns"][4]["value"]=played_by;
+	item["columns"][0]["column"] = "played_by";
+	item["columns"][0]["value"] = playedByName;
+	item["columns"][1]["column"] = "played";
+	item["columns"][1]["value"] = LLTrans::getString("animation_explorer_still_playing");
+	item["columns"][2]["column"] = "timestamp";
+	item["columns"][2]["value"] = time;
+	item["columns"][3]["column"] = "animation_id";
+	item["columns"][3]["value"] = id;
+	item["columns"][4]["column"] = "object_id";
+	item["columns"][4]["value"] = played_by;
 
-	mAnimationScrollList->addElement(item,ADD_TOP);
+	mAnimationScrollList->addElement(item, ADD_TOP);
 }
 
 void AnimationExplorer::requestNameCallback(LLMessageSystem* msg)
 {
 	// if we weren't looking for any IDs, ignore this callback
-	if(mRequestedIDs.empty())
+	if (mRequestedIDs.empty())
 	{
 		return;
 	}
 
 	// we might have received more than one answer in one block
-	S32 num=msg->getNumberOfBlocksFast(_PREHASH_ObjectData);
-	for (S32 index=0;index<num;index++)
+	S32 num = msg->getNumberOfBlocksFast(_PREHASH_ObjectData);
+	for (S32 index = 0; index < num; ++index)
 	{
 		LLUUID object_id;
-		msg->getUUIDFast(_PREHASH_ObjectData,_PREHASH_ObjectID,object_id,index);
+		msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_ObjectID, object_id, index);
 
-		std::vector<LLUUID>::iterator iter;
-		iter=std::find(mRequestedIDs.begin(),mRequestedIDs.end(),object_id);
+		uuid_vec_t::iterator iter;
+		iter = std::find(mRequestedIDs.begin(), mRequestedIDs.end(), object_id);
 		// if this is one of the objects we were looking for, process the data
-		if(iter!=mRequestedIDs.end())
+		if (iter != mRequestedIDs.end())
 		{
 			// get the name of the object
 			std::string object_name;
-			msg->getStringFast(_PREHASH_ObjectData,_PREHASH_Name,object_name,index);
+			msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Name, object_name, index);
 
 			// remove the object from the lookup list and add it to the known names list
 			mRequestedIDs.erase(iter);
-			mKnownIDs[object_id]=object_name;
+			mKnownIDs[object_id] = object_name;
 
-			S32 object_id_column=mAnimationScrollList->getColumn("object_id")->mIndex;
-			S32 played_by_column=mAnimationScrollList->getColumn("played_by")->mIndex;
+			S32 object_id_column = mAnimationScrollList->getColumn("object_id")->mIndex;
+			S32 played_by_column = mAnimationScrollList->getColumn("played_by")->mIndex;
 
 			// find all scroll list entries with this object UUID and update the names there
-			std::vector<LLScrollListItem*> items=mAnimationScrollList->getAllData();
-			for (std::vector<LLScrollListItem*>::iterator list_iter=items.begin();list_iter!=items.end();++list_iter)
+			std::vector<LLScrollListItem*> items = mAnimationScrollList->getAllData();
+			for (std::vector<LLScrollListItem*>::iterator list_iter = items.begin(); list_iter != items.end(); ++list_iter)
 			{
-				LLScrollListItem* item=*list_iter;
-				LLUUID list_object_id=item->getColumn(object_id_column)->getValue().asUUID();
+				LLScrollListItem* item = *list_iter;
+				LLUUID list_object_id = item->getColumn(object_id_column)->getValue().asUUID();
 
-				if(object_id==list_object_id)
+				if (object_id == list_object_id)
 				{
-					LLScrollListText* played_by_text=(LLScrollListText*) item->getColumn(played_by_column);
+					LLScrollListText* played_by_text = (LLScrollListText*)item->getColumn(played_by_column);
 					played_by_text->setText(object_name);
 				}
 			}
diff --git a/indra/newview/animationexplorer.h b/indra/newview/animationexplorer.h
index 92f5c25ad1..d0891f587b 100644
--- a/indra/newview/animationexplorer.h
+++ b/indra/newview/animationexplorer.h
@@ -59,7 +59,7 @@ class RecentAnimationList
 
 		std::deque<AnimationEntry> mAnimationList;
 
-		void addAnimation(const LLUUID& id,const LLUUID& playedBy);		// called in llviewermessage.cpp
+		void addAnimation(const LLUUID& id, const LLUUID& playedBy);		// called in llviewermessage.cpp
 		void requestList(AnimationExplorer* explorer);					// request animation list
 };
 
@@ -85,7 +85,7 @@ class AnimationExplorer
 
 	public:
 		/*virtual*/ BOOL postBuild();
-		void addAnimation(const LLUUID& id,const LLUUID& playedBy,F64 time);	// called from RecentAnimationList
+		void addAnimation(const LLUUID& id, const LLUUID& playedBy, F64 time);	// called from RecentAnimationList
 
 		// copied from llfloaterbvhpreview.h
 		BOOL handleMouseDown(S32 x, S32 y, MASK mask);
@@ -113,7 +113,7 @@ class AnimationExplorer
 		LLUUID mCurrentObject;			// object ID that played the currently selected animation
 
 		std::vector<LLUUID> mRequestedIDs;			// list of object IDs we requested named for
-		std::map<LLUUID,std::string> mKnownIDs;		// known list of names for object IDs
+		std::map<LLUUID, std::string> mKnownIDs;		// known list of names for object IDs
 
 		void draw();
 		void update();								// request list update from RecentAnimationList

From c82dd52491f8bfdb6159ba992d78e1b83d5673b0 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 14 Nov 2014 14:16:31 -0500
Subject: [PATCH 114/229] MAINT-4678: fix crash on launch in gpu benchmark

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

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 25c9b5684b..07d142c226 100755
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -214,7 +214,7 @@ void LLGLSLShader::startProfile()
 //static
 void LLGLSLShader::stopProfile(U32 count, U32 mode)
 {
-	if (sProfileEnabled)
+	if (sProfileEnabled && sCurBoundShaderPtr)
 	{
 		sCurBoundShaderPtr->readProfileQuery(count, mode);
 	}

From a18f9c1b38d721825f5b6f0880aac529cdb2fa9e Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 14 Nov 2014 23:15:46 +0100
Subject: [PATCH 115/229] FIRE-14600: Proposed fix for crash in fasttimer view:
 mBars might be null

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

diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 1b1f1189d7..5d5050103c 100755
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -256,6 +256,14 @@ BOOL LLFastTimerView::handleHover(S32 x, S32 y, MASK mask)
 			bar_index < end_index; 
 			++bar_index)
 		{
+			// <FS:Ansariel> FIRE-14600: mBars might be null here
+			if (!row.mBars)
+			{
+				LL_WARNS() << "Skipping null row bars" << LL_ENDL;
+				continue;
+			}
+			// </FS:Ansariel>
+
 			TimerBar& bar = row.mBars[bar_index];
 			if (bar.mSelfStart > mouse_time_offset)
 			{

From e8135c861df01de8d025ceaa0197e172acbdb191 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sat, 15 Nov 2014 14:31:27 +0100
Subject: [PATCH 116/229] FIRE-14976: Export Group list to include Donated
 SQM's

---
 indra/newview/llpanelgrouproles.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index ee9a2c2a34..f43e9e07a8 100755
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -1871,7 +1871,7 @@ void LLPanelGroupMembersSubTab::onExportMembersToXML()
 	LLAPRFile::tFiletype* file = outfile.getFileHandle();
 	if (!file) return;
 	
-	apr_file_printf(file, "Group membership record for %s", gdatap->mName.c_str());
+	apr_file_printf(file, "Group membership record for %s (avatar key, avatar name, last online, land contribution)", gdatap->mName.c_str());
 	
 	LLSD memberlist;
 	for (LLGroupMgrGroupData::member_list_t::const_iterator member_itr = gdatap->mMembers.begin();
@@ -1883,10 +1883,11 @@ void LLPanelGroupMembersSubTab::onExportMembersToXML()
 		/// When the group membership is fully loaded, this works fine as is.
 		LLAvatarName av_name;
 		LLAvatarNameCache::get(member_itr->first, &av_name);
-		apr_file_printf(file, "\n%s,%s,%s",
+		apr_file_printf(file, "\n%s,%s,%s,%s",
 						member_itr->first.asString().c_str(),
 						av_name.getCompleteName().c_str(),
-						member_itr->second->getOnlineStatus().c_str());
+						member_itr->second->getOnlineStatus().c_str(),
+						llformat("%d", member_itr->second->getContribution()).c_str());
 	}
 	apr_file_printf(file, "\n");
 }

From 0b3a88b07a08d2dfa9343da791283a5c1c5100ba Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sat, 15 Nov 2014 18:31:17 +0100
Subject: [PATCH 117/229] Polish translation tune-up (final) Based on my V3
 re-translation

---
 .../skins/default/xui/pl/notifications.xml    | 494 +++++++-----------
 .../newview/skins/default/xui/pl/strings.xml  |  91 +---
 2 files changed, 202 insertions(+), 383 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 05b03d28ad..806b17d53b 100755
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -9,7 +9,7 @@
 	<global name="implicitclosebutton">
 		Zamknij
 	</global>
-	<notification functor="GenericAcknowledge" label="Nieznany rodzaj komunikatu" name="MissingAlert">
+	<notification label="Nieznany rodzaj komunikatu" name="MissingAlert">
 		Twoja wersja klienta [APP_NAME] nie może wyświetlić odebranej wiadomości. Upewnij się, że posiadasz najnowszą wersję klienta.
 
 Szczegóły błędu: Błąd o nazwie &apos;[_NAME]&apos; nie został odnaleziony w pliku notifications.xml.
@@ -18,11 +18,9 @@ Szczegóły błędu: Błąd o nazwie &apos;[_NAME]&apos; nie został odnaleziony
 		Błąd: nie można znaleźć następujących elementów:
 
 [CONTROLS]
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="TutorialNotFound">
 		Brak samouczka na ten temat
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="GenericAlertYesCancel">
 		[MESSAGE]
@@ -30,17 +28,14 @@ Szczegóły błędu: Błąd o nazwie &apos;[_NAME]&apos; nie został odnaleziony
 	</notification>
 	<notification name="BadInstallation">
 		Podczas aktualizacji [APP_NAME] wystąpił błąd. Proszę [http://get.secondlife.com odwiedzić stronę] aby ściągnąć ostatnią wersję klienta.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LoginFailedNoNetwork">
 		Nie można połączyć z [SECOND_LIFE_GRID].
-    &apos;[DIAGNOSTIC]&apos;
+&apos;[DIAGNOSTIC]&apos;
 Upewnij się, że Twoje połączenie z internetem działa.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="MessageTemplateNotFound">
 		Szablon komunikatu dla [PATH] nie został odnaleziony.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="WearableSave">
 		Zapisać zmiany dotyczące ubrania/części ciała?
@@ -52,13 +47,13 @@ Upewnij się, że Twoje połączenie z internetem działa.
 	</notification>
 	<notification name="OutboxFolderCreated">
 		Nowy folder został stworzony dla każdego przedmiotu przeniesionego do głównego poziomu Skrzynki Nadawczej Kupca.
-		<usetemplate ignoretext="Nowy folder został stworzony w Skrzynce Nadawczej Kupca" name="okignore" yestext="OK"/>
+		<usetemplate ignoretext="Nowy folder został stworzony w Skrzynce Nadawczej Kupca" name="okignore" />
 	</notification>
 	<notification name="OutboxImportComplete">
 		Powodzenie
 
 Wszystkie foldery zostały pomyślnie wysłane na Marketplace.
-		<usetemplate ignoretext="Wszystkie foldery wysłano na Marketplace" name="okignore" yestext="OK"/>
+		<usetemplate ignoretext="Wszystkie foldery wysłano na Marketplace" name="okignore" />
 	</notification>
 	<notification name="OutboxImportHadErrors">
 		Niektóre foldery nie zostały wysłane
@@ -66,19 +61,16 @@ Wszystkie foldery zostały pomyślnie wysłane na Marketplace.
 Wystąpiły błędy w wysyłaniu pewnych folderów na Marketplace. Są one ciągle obecne w Skrzynce Nadawczej Kupca.
 
 Zobacz [[MARKETPLACE_IMPORTS_URL] log błędów] aby uzyskać więcej informacji.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="OutboxImportFailed">
 		Transfer nieudany, błąd &apos;[ERROR_CODE]&apos;
 
 Foldery nie zostały wysłane na Marketplace z powodu błędu sieci lub systemu. Spróbuj później.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="OutboxInitFailed">
 		Inicjalizacja Marketplace nieudana, błąd &apos;[ERROR_CODE]&apos;
 
 Inicjalizacja Marketplace nieudana z powodu błędu sieci lub systemu. Spróbuj później.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CompileQueueSaveText">
 		W trakcie ładowania tekstu dla skryptu pojawił się problem z następującego powodu: [REASON]. Spróbuj ponownie za kilka minut.
@@ -102,11 +94,9 @@ Wybierz pojedynczy obiekt i spróbuj jeszcze raz.
 	</notification>
 	<notification name="FriendsAndGroupsOnly">
 		Osoby spoza listy znajomych nie będą wiedzieć, że zdecydowałeś/aś się ignorować ich rozmowy głosowe i wiadomości IM.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="FavoritesOnLogin">
-		Pamiętaj: kiedy włączysz tą opcję to każdy kto używa tego komputera może zobaczyć Twoją listę ulubionych miejsc.
-		<usetemplate name="okbutton" yestext="OK"/>
+		Pamiętaj: kiedy włączysz tą opcję to każdy kto używa tego komputera będzie mógł zobaczyć Twoją listę ulubionych miejsc.
 	</notification>
 	<notification name="GrantModifyRights">
 		Udzielenie praw modyfikacji innemu Rezydentowi umożliwia modyfikację, usuwanie lub wzięcie JAKIEGOKOLWIEK z Twoich obiektów. Używaj tej opcji z rozwagą!
@@ -129,7 +119,6 @@ Czy chcesz dać prawa modyfikacji wybranym osobom?
 	<notification name="UnableToCreateGroup">
 		Założenie grupy nie jest możliwe.
 [MESSAGE]
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="PanelGroupApply">
 		[NEEDS_APPLY_MESSAGE]
@@ -138,14 +127,13 @@ Czy chcesz dać prawa modyfikacji wybranym osobom?
 	</notification>
 	<notification name="MustSpecifyGroupNoticeSubject">
 		Aby wysłać ogłoszenie do grupy musisz nadać mu tytuł.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="AddGroupOwnerWarning">
 		Dodajesz osoby do funkcji [ROLE_NAME].
 Ta funkcja nie może być odebrana.
 Osoby muszą same zrezygnować z pełnienia tej funkcji.
 Chcesz kontynuować?
-		<usetemplate ignoretext="Przed dodaniem nowego właściciela do grupy, proszę potwierdzić swoją decyzję." name="okcancelignore" notext="Nie" yestext="Tak"/>
+		<usetemplate ignoretext="Potwierdź przed dodaniem nowego właściciela grupy" name="okcancelignore" notext="Nie" yestext="Tak"/>
 	</notification>
 	<notification name="AssignDangerousActionWarning">
 		Dodajesz przywilej &apos;[ACTION_NAME]&apos; do funkcji &apos;[ROLE_NAME]&apos;.
@@ -172,7 +160,6 @@ Dodać ten przywilej do funkcji &apos;[ROLE_NAME]&apos;?
 
 *UWAGA*
 Osoba w funkcji z tym przywilejem otrzyma również &apos;[ACTION_NAME_2]&apos; oraz &apos;[ACTION_NAME_3]&apos;
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RemoveBanAbilityWarning">
 		Zabierasz przywilej &apos;[ACTION_NAME]&apos; z funkcji &apos;[ROLE_NAME]&apos;
@@ -181,7 +168,6 @@ Osoba w funkcji z tym przywilejem otrzyma również &apos;[ACTION_NAME_2]&apos;
 Zabranie tej funkcji NIE usunie &apos;[ACTION_NAME_2]&apos; oraz &apos;[ACTION_NAME_3]&apos;.
 
 Jeśli nie chcesz, aby te przywileje były dłużej przypisane do tej roli, to wyłącz je natychmiast!
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="EjectGroupMemberWarning">
 		Zamierzasz wyrzucić [AVATAR_NAME] z grupy.
@@ -192,9 +178,9 @@ Jeśli nie chcesz, aby te przywileje były dłużej przypisane do tej roli, to w
 		<usetemplate ignoretext="Potwierdź wyrzucenie kilku osób z grupy" name="okcancelignore" notext="Anuluj" yestext="Wyrzuć"/>
 	</notification>
 	<notification name="AttachmentDrop">
-		Wybrałeś opcję upuszczenia swojego dodatku.
-    Czy chcesz kontynuować?
-		<usetemplate ignoretext="Potwierdź przed upuszczeniem dodatku." name="okcancelignore" notext="Nie" yestext="Tak"/>
+		Wybrałeś/aś opcję upuszczenia swojego dodatku.
+Czy chcesz kontynuować?
+		<usetemplate ignoretext="Potwierdź przed upuszczeniem dodatku" name="okcancelignore" notext="Nie" yestext="Tak"/>
 	</notification>
 	<notification name="JoinGroupCanAfford">
 		Dołączenie do tej grupy kosztuje [COST]L$.
@@ -207,7 +193,7 @@ Czy chcesz kontynuować?
 		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Dołącz"/>
 	</notification>
 	<notification name="JoinGroupCannotAfford">
-		Członkostwo w tej grupie kosztuje [COST]L$
+		Członkostwo w tej grupie kosztuje [COST]L$.
 Masz za mało L$ żeby do niej dołączyć.
 	</notification>
 	<notification name="CreateGroupCost">
@@ -218,7 +204,7 @@ Zaproś kogoś w ciągu 48 godzin.
 	</notification>
 	<notification name="LandBuyPass">
 		Za [COST]L$ możesz odwiedzić tą działkę (&apos;[PARCEL_NAME]&apos;) na [TIME] godzin. Chcesz kupić przepustkę?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="SalePriceRestriction">
 		Cena sprzedaży musi być wyższa niż 0L$ jeżeli sprzedajesz komukolwiek.
@@ -227,67 +213,66 @@ Musisz wybrać kupca jeżeli chcesz sprzedać za 0L$.
 	<notification name="ConfirmLandSaleChange">
 		Działka o powierzchni [LAND_SIZE] m² zostaje wystawiona na sprzedaż.
 Cena wynosi [SALE_PRICE]L$, a sprzedaż będzie autoryzowana dla [NAME].
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmLandSaleToAnyoneChange">
-		UWAGA: Wybierając opcję &quot;Sprzedaj Każdemu&quot; udostępniasz swoją działkę na sprzedaż dla jakiegokolwiek Rezydenta [CURRENT_GRID] , nawet osób nieobecnych w tym regionie.
+		UWAGA: Wybierając opcję &quot;Sprzedaj Każdemu&quot; udostępniasz swoją działkę na sprzedaż dla jakiegokolwiek Rezydenta [CURRENT_GRID], nawet osób nieobecnych w tym regionie.
 
 Działka o powierzchni [LAND_SIZE] m² zostaje wystawiona na sprzedaż.
 Cena wynosi [SALE_PRICE]L$, a sprzedaż będzie autoryzowana dla [NAME].
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ReturnObjectsDeededToGroup">
 		Czy na pewno chcesz zwrócić wszystkie obiekty udostępnione grupie &apos;[NAME]&apos; na tej działce do szaf ich poprzednich właścicieli?
 
-*UWAGA* Wybrana opcja spowoduje usunięcie wszystkich obiektów
-udostępnionych grupie, które nie mają praw transferu!
+*UWAGA* Wybrana opcja spowoduje usunięcie wszystkich obiektów udostępnionych grupie, które nie mają praw transferu!
 
 Obiekty: [N]
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ReturnObjectsOwnedByUser">
 		Czy na pewno chcesz zwrócić wszystkie obiekty należące do Rezydenta &apos;[NAME]&apos; znajdujące się na tej działce do szafy właściciela?
 
 Obiekty: [N]
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ReturnObjectsOwnedBySelf">
 		Czy na pewno chcesz zwrócić wszystkie Twoje obiekty znajdujące się na tej działce do swojej szafy?
 
 Obiekty: [N]
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ReturnObjectsNotOwnedBySelf">
-		Czy na pewno chcesz zwrócić wszystkie obiekty, których nie jesteś właścicielem znajdujące się na tej działce do szaf właścicieli?
+		Czy na pewno chcesz zwrócić wszystkie obiekty, których NIE jesteś właścicielem znajdujące się na tej działce do szaf właścicieli?
 Wszystkie obiekty udostępnione grupie z prawem transferu zostaną zwrócone poprzednim właścicielom.
 
 *UWAGA* Wybrana opcja spowoduje usunięcie wszystkich obiektów udostępnionych grupie, które nie mają praw transferu!
 
 Obiekty: [N]
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ReturnObjectsNotOwnedByUser">
-		Czy na pewno chcesz zwrócić wszystkie obiekty, które nie należą do [NAME], a znajdujące się na tej działce - do szaf właścicieli?
-Wszystkie obiekty udostępnione grupie z prawem transferu, zostaną zwrócone poprzednim właścicielom.
+		Czy na pewno chcesz zwrócić wszystkie obiekty, które NIE należą do [NAME], a znajdujące się na tej działce - do szaf właścicieli?
+Wszystkie obiekty udostępnione grupie z prawem transferu zostaną zwrócone poprzednim właścicielom.
 
 *UWAGA* Wybrana opcja spowoduje usunięcie wszystkich obiektów udostępnionych grupie, które nie mają praw transferu!
 
 Obiekty: [N]
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ReturnAllTopObjects">
 		Czy na pewno chcesz zwrócić wszystkie wymienione obiekty znajdujące się na tej działce do szaf ich właścicieli?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="DisableAllTopObjects">
-		Czy na pewno chcesz dezaktywować wszystkie obiekty w tym Regionie?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		Czy na pewno chcesz dezaktywować wszystkie obiekty w tym regionie?
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ReturnObjectsNotOwnedByGroup">
-		Zwrócić obiekty z tej działki, które nie są udostępnione grupie [NAME] do ich właścicieli?
+		Zwrócić obiekty z tej działki, które NIE są udostępnione grupie [NAME] do ich właścicieli?
 
 Obiekty: [N]
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="UnableToDisableOutsideScripts">
 		Nie można dezaktywować skryptów.
@@ -298,7 +283,7 @@ Skrypty muszą pozostać aktywne dla prawidłowego działania broni.
 		Obecnie zaznaczono wiele powierzchni.
 Jeśli kontynuujesz, to oddzielne instancje mediów będą ustawione na wielu powierzchniach obiektu.
 W celu umieszczenia mediów tylko na jednej powierzchni skorzystaj z narzędzia wyboru powierzchni i kliknij na ten wybranej oraz na Dodaj.
-		<usetemplate ignoretext="Media zostaną ustawione na wielu zaznaczonych powierzchniach" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Media zostaną ustawione na wielu zaznaczonych powierzchniach" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="MustBeInParcel">
 		Musisz znajdować się wewnątrz działki, żeby wybrać punkt lądowania.
@@ -311,7 +296,7 @@ W celu umieszczenia mediów tylko na jednej powierzchni skorzystaj z narzędzia
 	</notification>
 	<notification name="PromptMissingSubjMsg">
 		Wysłać zdjęcie z domyślnym tematem lub wiadomością?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ErrorProcessingSnapshot">
 		Błąd w trakcie przetwarzania danych zdjęcia.
@@ -360,7 +345,7 @@ Potrzebujesz konta aby się zalogować do [CURRENT_GRID]. Czy chcesz utworzyć j
 	<notification name="DeleteClassified">
 		Usunąć reklamę &apos;[NAME]&apos;?
 Pamiętaj! Nie ma rekompensaty za poniesione koszta.
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="DeleteMedia">
 		Wybrano usunięcie mediów związanych z tą powierzchnią.
@@ -373,19 +358,18 @@ Czy na pewno chcesz kontynuować?
 	</notification>
 	<notification name="ClassifiedInsufficientFunds">
 		Nie posiadasz wystarczających środków aby dodać reklamę.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeleteAvatarPick">
-		Usuń miejsce &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		Usunąć miejsce &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="DeleteOutfits">
 		Skasować wybrane stroje?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="PromptGoToEventsPage">
-		Odwiedzić internetową stronę Imprez [CURRENT_GRID]?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		Odwiedzić internetową stronę imprez [CURRENT_GRID]?
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="SelectProposalToView">
 		Wybierz propozycję, którą chcesz zobaczyć.
@@ -414,14 +398,14 @@ Pamiętaj: Opcja ta wyczyszcza bufor danych.
 	</notification>
 	<notification name="ChangeSkin">
 		Nowa skórka pojawi się po restarcie aplikacji [APP_NAME].
-		<usetemplate name="okcancelbuttons" notext="Ok" yestext="Restartuj"/>
+		<usetemplate name="okcancelbuttons" yestext="Restartuj"/>
 	</notification>
 	<notification name="ChangeLanguage">
 		Zmiana języka zadziała po restarcie [APP_NAME].
 	</notification>
 	<notification name="GoToAuctionPage">
 		Odwiedzić stronę internetową [CURRENT_GRID] żeby zobaczyć szczegóły aukcji lub zgłosić ofertę?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="SaveChanges">
 		Zapisać zmiany?
@@ -429,7 +413,7 @@ Pamiętaj: Opcja ta wyczyszcza bufor danych.
 	</notification>
 	<notification name="DeleteNotecard">
 		Czy na pewno chcesz usunąć tą notkę?
-		<usetemplate ignoretext="Potwierdź usuwanie notki" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Potwierdź usuwanie notki" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="GestureSaveFailedTooManySteps">
 		Nie można zapisać gestu.
@@ -440,14 +424,14 @@ Usuń kilka etapów i zapisz jeszcze raz.
 		Zapis gestu nie powiódł się. Spróbuj jeszcze raz za kilka minut.
 	</notification>
 	<notification name="GestureSaveFailedObjectNotFound">
-		Nie można zapisać gestu, ponieważ obiekt lub szafa powiązanego obiektu nie została znaleziona.
+		Nie można zapisać gestu, ponieważ obiekt lub zawartość powiązanego obiektu nie została znaleziona.
 Obiekt może znajdować się zbyt daleko albo został usunięty.
 	</notification>
 	<notification name="GestureSaveFailedReason">
 		Nie można zapisać gestu z następującego powodu: [REASON]. Spróbuj zapisać jeszcze raz później.
 	</notification>
 	<notification name="SaveNotecardFailObjectNotFound">
-		Nie można zapisać notki, ponieważ obiekt lub szafa powiązanego obiektu nie została znaleziona.
+		Nie można zapisać notki, ponieważ obiekt lub zawartość powiązanego obiektu nie została znaleziona.
 Obiekt może znajdować się zbyt daleko albo został usunięty.
 	</notification>
 	<notification name="SaveNotecardFailReason">
@@ -457,7 +441,7 @@ Obiekt może znajdować się zbyt daleko albo został usunięty.
 		Nie można cofnąć wszystkich zmian w Twojej wersji skryptu.
 Czy chcesz załadować ostatnią wersję zapisaną na serwerze?
 (*UWAGA* Ta operacja jest nieodwracalna.)
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="SaveScriptFailReason">
 		Nie można zapisać skryptu z następującego powodu: [REASON]. Spróbuj zapisać jeszcze raz później.
@@ -472,7 +456,6 @@ Obiekt może znajdować się zbyt daleko albo został usunięty.
 	<notification name="StartRegionEmpty">
 		Twoje miejsce startu nie zostało określone.
 Wpisz proszę nazwę regionu w lokalizację startu w polu Lokalizacja Startu lub wybierz &apos;Moja ostatnia lokalizacja&apos; albo &apos;Miejsce Startu&apos;.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
 		Nie można uruchomić lub zatrzymać skryptu ponieważ obiekt w którym się zawiera nie został znaleziony.
@@ -488,9 +471,6 @@ Obiekt może znajdować się zbyt daleko albo został usunięty.
 		Niestety Twój komputer nie spełnia minimalnych wymogów sprzętowych dla poprawnego działania [APP_NAME]. Możesz odczuwać bardzo niską wydajność operacyjną. Niestety, portal pomocy [SUPPORT_SITE] nie jest w stanie zapewnić wsparcia technicznego dla Twojego systemu.
 
 Odwiedzić [_URL], aby uzyskać więcej informacji?
-		<url name="url">
-			http://www.secondlife.com/corporate/sysreqs.php
-		</url>
 		<usetemplate ignoretext="Sprzęt w moim komputerze nie jest wspierany" name="okcancelignore" notext="Nie" yestext="Tak"/>
 	</notification>
 	<notification name="IntelOldDriver">
@@ -509,9 +489,6 @@ Odwiedzić [_URL] aby sprawdzić, czy są nowsze sterowniki?
 		Prawdopodobnie istnieje nowszy sterownik dla Twojej karty graficznej. Aktualizacja sterowników graficznych może znacznie zwiększyć wydajność.
 
 Odwiedzić [_URL] aby sprawdzić, czy są nowsze sterowniki?
-		<url name="url">
-			http://www.nvidia.pl/Download/index.aspx?lang=pl
-		</url>
 		<usetemplate ignoretext="Moje sterowniki grafiki są przestarzałe" name="okcancelignore" notext="Nie" yestext="Tak"/>
 	</notification>
 	<notification name="UnknownGPU">
@@ -613,7 +590,7 @@ Przemieść wszystkie otrzymywane obiekty do jednego regionu.
 		[EXTRA]
 
 Odwiedzić [_URL] po więcej informacji na temat zakupu L$?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="UnableToLinkObjects">
 		Nie można połączyć [COUNT] obiektów.
@@ -643,7 +620,6 @@ Upewnij się, że nazwa pliku ma poprawne rozszerzenie.
 	<notification name="InvalidFileExtension">
 		Niepoprawne rozszerzenie pliku: [EXTENSION]
 Oczekiwane: [VALIDS]
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CannotUploadSoundFile">
 		Nie można otworzyć załadowanego pliku dźwiękowego:
@@ -698,7 +674,6 @@ Oczekiwane: [VALIDS]
 	<notification name="CorruptedProtectedDataStore">
 		Nie można zdekodować pliku zawierającego nazwy użytkowników i haseł. Jeśli teraz je zapiszesz lub usuniesz, to wymażesz te, które były trzymane w nim wcześniej.
 To może się zdarzyć, kiedy zmieniasz ustawienia sieci. Zrestartowanie Przeglądarki z poprzednimi ustawieniami sieci może pomóc w odzyskaniu danych.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CorruptResourceFile">
 		Uszkodzony plik zasobów: [FILE]
@@ -721,7 +696,6 @@ Spróbuj jeszcze raz później.
 	</notification>
 	<notification name="LandmarkAlreadyExists">
 		Posiadasz już landmark dla tej lokalizacji.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CannotCreateLandmarkNotOwner">
 		Nie możesz zapamiętać tego miejsca (LM) ponieważ właściciel działki nie pozwala na to.
@@ -812,7 +786,7 @@ Jeżeli nadal otrzymujesz tę wiadomość proponujemy odwiedzić stronę [SUPPOR
 		Przepraszamy, ale nie udało się przeprowadzić zmiany regionu wystarczająco szybko. Spróbuj jeszcze raz za kilka minut.
 	</notification>
 	<notification name="no_host">
-		Nie możemy znaleźć miejsca docelowego. To miejsce może być chwilowo nieosiągalne albo przestało istnieć. Spróbuj jeszcze raz za kilka minut.
+		Nie można znaleźć miejsca docelowego. To miejsce może być chwilowo nieosiągalne albo przestało istnieć. Spróbuj jeszcze raz za kilka minut.
 	</notification>
 	<notification name="no_inventory_host">
 		Szafa chwilowo nie działa.
@@ -827,7 +801,7 @@ Działka nie została wybrana.
 	<notification name="ForceOwnerAuctionWarning">
 		Ta działka jest wystawiona na aukcję. Wymuszenie własności anuluje aukcję i potencjalnie może zdenerwować zainteresowanych Rezydentów, jeżeli licytacja już się rozpoczęła.
 Wymusić własność?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="CannotContentifyNothingSelected">
 		Nie można sfinalizować:
@@ -851,7 +825,7 @@ Działka nie została wybrana.
 	</notification>
 	<notification name="CannotBuyLandNoRegion">
 		Nie można kupić działki:
-Region nie znaleziony.
+Region nie został znaleziony.
 	</notification>
 	<notification name="CannotCloseFloaterBuyLand">
 		Okno zakupu ziemi nie może zostać zamknięte dopóki aplikacja [APP_NAME] nie określi ceny dla tej transakcji.
@@ -931,7 +905,7 @@ Wybierz całą działkę albo najpierw ją podziel.
 Porzucenie tej działki usunie ją z Twoich własności, ale nie otrzymasz za to żadnych L$.
 
 Porzucić działkę?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="CannotDivideLandNothingSelected">
 		Nie można podzielić działki:
@@ -949,7 +923,7 @@ Spróbuj wybrać część działki.
 Niektóre ustawienia zostaną zmienione na domyślne po tej operacji.
 
 Podzielić działkę?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="CannotDivideLandNoRegion">
 		Brak możliwości podziału działki:
@@ -980,11 +954,11 @@ Wybierz obszar usytuowany na obu działkach.
 Nazwa i opcje działki będą musiały zostać skonfigurowane.
 
 Połączyć działki?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmNotecardSave">
 		Ta notka musi być zapisana żeby mogła być skopiowana lub zobaczona. Zapisać notkę?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmItemCopy">
 		Skopiować ten obiekt do Twojej szafy?
@@ -1008,7 +982,7 @@ Zazwyczaj jest to tymczasowy problem. Możesz kontynuować modyfikacje i zapisa
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
 		Nastąpiło wylogowanie z [CURRENT_GRID]
-            [MESSAGE]
+[MESSAGE]
 		<usetemplate name="okcancelbuttons" notext="Wyłącz" yestext="Pokaż IM/czat"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
@@ -1023,19 +997,15 @@ Zaproponować znajomość [NAME]?
 			<input name="message">
 				Chcesz zawrzeć ze mną znajomość?
 			</input>
-			<button name="Offer" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
 	<notification label="Nowa lista autokorekty" name="AddAutoReplaceList">
 		Nazwa nowej listy:
-		<form name="form">
-			<button name="SetName" text="OK"/>
-		</form>
 	</notification>
 	<notification label="Zmiana nazwy listy autokorekty" name="RenameAutoReplaceList">
 		Nazwa '[DUPNAME]' jest w użyciu
-    Wprowadź nową nazwę:
+Wprowadź nową nazwę:
 		<form name="form">
 			<button name="ReplaceList" text="Zastąp obecną listę"/>
 			<button name="SetName" text="Użyj nowej nazwy"/>
@@ -1058,9 +1028,9 @@ Zobacz https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 	</notification>
 	<notification name="SpellingDictImportFailed">
 		Nie można skopiować
-    [FROM_NAME]
-    do
-    [TO_NAME]
+[FROM_NAME]
+do
+[TO_NAME]
 	</notification>
 	<notification label="Zapisz strój" name="SaveOutfitAs">
 		Zapisz to co noszę jako nowy strój:
@@ -1068,7 +1038,6 @@ Zobacz https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 			<input name="message">
 				[DESC] (nowy)
 			</input>
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
@@ -1078,45 +1047,40 @@ Zobacz https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 			<input name="message">
 				[DESC] (nowy)
 			</input>
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
 	<notification label="Zmień nazwę stroju" name="RenameOutfit">
 		Nowa nazwa stroju:
 		<form name="form">
-			<input name="new_name">
-				[NAME]
-			</input>
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
 	<notification name="RemoveFromFriends">
 		Czy chcesz usunąć &lt;nolink&gt;[NAME]&lt;/nolink&gt; z listy znajomych?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="RemoveMultipleFromFriends">
 		Chcesz usunąć grupę osób z listy Twoich znajomych?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="GodDeleteAllScriptedPublicObjectsByUser">
 		Na pewno chcesz usunąć wszystkie skryptowane obiekty należące do
 ** [AVATAR_NAME] **
 z działek innych w tym symulatorze?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="GodDeleteAllScriptedObjectsByUser">
 		Na pewno chcesz usunąć wszystkie skryptowane obiekty należące do
 ** [AVATAR_NAME] **
 ze wszystkich działek w tym symulatorze?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="GodDeleteAllObjectsByUser">
 		Na pewno chcesz usunąć wszystkie obiekty (skryptowane i nie) należące do
 ** [AVATAR_NAME] **
 ze wszystkich działek w tym symulatorze?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="BlankClassifiedName">
 		Musisz nadać tytuł Twojej reklamie.
@@ -1130,46 +1094,46 @@ Wybierz wyższą cenę.
 		Co najmniej jeden z zaznaczonych przez Ciebie elementów ma połączone z nim obiekty. Jeśli go usuniesz połączenia zostaną usunięte na stałe. Zaleca się usunięcie połączeń w pierwszej kolejności.
 
 Jesteś pewien/pewna, że chcesz usunąć te elementy?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmObjectDeleteLock">
 		Przynajmniej jeden z wybranych obiektów jest zablokowany.
 
 Na pewno chcesz usunąć te obiekty?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopy">
 		Przynajmniej jeden z wybranych obiektów jest niekopiowalny.
 
 Na pewno chcesz usunąć te obiekty?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmObjectDeleteNoOwn">
 		Przynajmniej jeden z wybranych obiektów nie należy do Ciebie.
 
 Na pewno chcesz usunąć te obiekty?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
 		Przynajmniej jeden z wybranych obiektów jest zablokowany.
 Przynajmniej jeden z wybranych obiektów jest niekopiowalny.
 
 Na pewno chcesz usunąć te obiekty?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoOwn">
 		Przynajmniej jeden z wybranych obiektów jest zablokowany.
 Przynajmniej jeden z wybranych obiektów nie należy do Ciebie.
 
 Na pewno chcesz usunąć te obiekty?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
 		Przynajmniej jeden z wybranych obiektów jest niekopiowalny.
 Przynajmniej jeden z wybranych obiektów nie należy do Ciebie.
 
 Na pewno chcesz usunąć te obiekty?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
 		Przynajmniej jeden z wybranych obiektów jest zablokowany.
@@ -1177,20 +1141,20 @@ Przynajmniej jeden z wybranych obiektów jest niekopiowalny.
 Przynajmniej jeden z wybranych obiektów nie należy do Ciebie.
 
 Na pewno chcesz usunąć te obiekty?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
 		Przynajmniej jeden obiekt jest zablokowany.
 
 Na pewno chcesz wziąć te obiekty?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmObjectTakeNoOwn">
 		Przynajmniej jeden obiekt nie należy do Ciebie.
 Jeżeli będziesz kontynuować prawa następnego właściciela zostaną przypisane, co - potencjalnie - może ograniczyć Twoje prawa do modyfikacji lub kopiowania obiektów.
 
 Na pewno chcesz wziąć te obiekty?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmObjectTakeLockNoOwn">
 		Przynajmniej jeden obiekt jest zablokowany.
@@ -1198,7 +1162,7 @@ Przynajmniej jeden obiekt nie należy do Ciebie.
 Jeżeli będziesz kontynuować prawa następnego właściciela zostaną przypisane co - potencjalnie - może ograniczyć Twoje prawa do modyfikacji lub kopiowania obiektów.
 
 Na pewno chcesz wziąć te obiekty?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="CantBuyLandAcrossMultipleRegions">
 		Nie możesz kupić działki, ponieważ wybrany obszar przekracza granicę regionów.
@@ -1210,7 +1174,7 @@ Wybierz mniejszy obszar i spróbuj jeszcze raz.
 Cena zakupu działki nie jest zwracana właścicielowi. Jeżeli przekazana działka zostanie sprzedana, cena sprzedaży zostanie podzielona pomiędzy członków grupy.
 
 Przekazać tą działkę o powierzchni [AREA] m² grupie &apos;[GROUP_NAME]&apos;?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="DeedLandToGroupWithContribution">
 		Po przekazaniu tej działki grupa będzie musiała mieć i utrzymywać wystarczający kredyt na używanie działki.
@@ -1218,7 +1182,7 @@ Przekazanie będzie zawierać równoczesne przypisanie działki do grupy od &apo
 Cena zakupu działki nie jest zwracana właścicielowi. Jeżeli przekazana działka zostanie sprzedana, cena sprzedaży zostanie podzielona pomiędzy członków grupy.
 
 Przekazać tą działkę o powierzchni [AREA] m² grupie &apos;[GROUP_NAME]&apos;?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="DisplaySetToSafe">
 		Ustawienia grafiki zostały zmienione do bezpiecznego poziomu ponieważ opcja -safe została wybrana.
@@ -1231,10 +1195,6 @@ na &apos;[THIS_GPU]&apos;
 	<notification name="DisplaySetToRecommendedFeatureChange">
 		Ustawienia grafiki zostały zmienione do zalecanego poziomu ze względu na zmianę podsystemu renderingu.
 	</notification>
-	<notification name="ErrorMessage">
-		[ERROR_MESSAGE]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
 	<notification name="AvatarMovedDesired">
 		Miejsce, do którego chcesz się teleportować jest chwilowo niedostępne.
 Zostałeś/aś przeniesiony/a do regionu sąsiedniego.
@@ -1267,7 +1227,6 @@ Czy chcesz przejść na stronę [http://join.secondlife.com secondlife.com] żeb
 
 Możesz sprawdzić swoje połączenie z Internetem i spróbować ponownie za kilka minut, połączyć się ze stroną pomocy technicznej ([SUPPORT_SITE]) lub wybrać Teleportuj, by teleportować się do swojego miejsca startu.
 		<form name="form">
-			<button name="OK" text="OK"/>
 			<button name="Help" text="Pomoc"/>
 			<button name="Teleport" text="Teleportuj"/>
 		</form>
@@ -1282,7 +1241,6 @@ Wybierz awatara właściwej płci. Ten wybór będzie można później zmienić.
 	</notification>
 	<notification name="CantTeleportToGrid">
 		Nie można teleportować do [SLURL], ponieważ jest na innej siatce ([GRID]) niż obecna siatka ([CURRENT_GRID]). Proszę zamknąć przeglądarkę i spróbować ponownie.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="GeneralCertificateError">
 		Połączenie z serwerem nie mogło zostać nawiązane.
@@ -1297,7 +1255,7 @@ Odcisk palca SHA1: [MD5_DIGEST]
 Użycie klucza: [KEYUSAGE]
 Rozszerzone użycie klucza: [EXTENDEDKEYUSAGE]
 Identyfikator klucza podmiotu: [SUBJECTKEYIDENTIFIER]
-		<usetemplate name="okbutton" yestext="OK"/>
+		
 	</notification>
 	<notification name="TrustCertificateError">
 		Wydawca certyfikatu dla tego serwera nie jest znany.
@@ -1329,7 +1287,7 @@ Czy chcesz zaufać temu wydawcy?
 		To spowoduje wyczyszczenie buforów map regionu.
 Jest to użyteczne wyłącznie podczas szukania błędów.
 (W normalnym użytkowaniu poczekaj 5 minut, a mapy wszystkich zostaną uaktualnione po relogu.)
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="BuyOneObjectOnly">
 		Nie możesz zakupić więcej niż jednego obiektu w tym samym czasie. Proszę wybrać tylko jeden obiekt i spróbować ponownie.
@@ -1337,19 +1295,20 @@ Jest to użyteczne wyłącznie podczas szukania błędów.
 	<notification name="OnlyCopyContentsOfSingleItem">
 		Nie można kopiować zawartości więcej niż jednego obiektu naraz.
 Wybierz pojedynczy obiekt i spróbuj jeszcze raz.
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="KickUsersFromRegion">
 		Teleportować wszystkich Rezydentów z tego regionu do ich miejsc startu?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="EstateObjectReturn">
 		Na pewno chcesz odesłać wszystkie obiekty należące do [USER_NAME]?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="InvalidTerrainBitDepth">
 		Nie można ustawić tekstur regionu:
 Tekstura terenu [TEXTURE_NUM] ma niewłaściwą głębię koloru - [TEXTURE_BIT_DEPTH].
+
 Zamień teksturę [TEXTURE_NUM] na 24-bitową teksturę o wymiarze 1024x1024 lub mniejszą i ponownie kliknij na &quot;Zastosuj&quot;.
 	</notification>
 	<notification name="InvalidTerrainSize">
@@ -1363,7 +1322,7 @@ Zamień teksturę [TEXTURE_NUM] na 24-bitową teksturę o wymiarze 1024x1024 lub
 	</notification>
 	<notification name="ConfirmBakeTerrain">
 		Na pewno chcesz zapisać obecne ukształtowanie terenu jako punkt odniesienia dla górnego i dolnego limitu terenu oraz jako domyślną wartość dla opcji &apos;Odtwórz&apos;?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="MaxAllowedAgentOnRegion">
 		Maksymalna liczba Rezydentów wynosi [MAX_AGENTS].
@@ -1463,7 +1422,6 @@ Pobrać i zapisać w folderze Aplikacje?
 		Podczas aktualizacji pojawił się błąd.
 Proszę pobrać i zainstalować najnowszego klienta z
 http://secondlife.com/download lub http://www.phoenixviewer.com.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="FailedRequiredUpdateInstall">
 		Nie można zainstalować wymaganej aktualizacji.
@@ -1493,76 +1451,71 @@ Wersja [VERSION] [[INFO_URL] Informacja o aktualizacji]
 Wersja [VERSION] [[INFO_URL] Informacje o tej aktualizacji]
 
 W celu instalacji aktualizacji [APP_NAME] musi zostać zrestartowany.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		W celu instalacji aktualizacji [APP_NAME] musi zostać zrestartowany.
-
 [[INFO_URL] Informacje o tej aktualizacji]
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="OtherChannelDownloadBackgroundTip">
 		Została pobrana aktualizacja dla Twojej instalacji [APP_NAME].
 Wersja [VERSION]
 Ta eksperymentalna przeglądarka została zastąpiona przez wersję [NEW_CHANNEL];
-zobacz [[INFO_URL] aby uzyskać więcej informacji o tej aktualizacji]
+zobacz [[INFO_URL] Więcej informacji o tej aktualizacji]
 		<usetemplate name="okcancelbuttons" notext="Później..." yestext="Instaluj teraz i zrestartuj [APP_NAME]"/>
 	</notification>
 	<notification name="OtherChannelDownloadBackgroundDialog">
 		Została pobrana aktualizacja dla Twojej instalacji [APP_NAME].
 Wersja [VERSION]
 Ta eksperymentalna przeglądarka została zastąpiona przez wersję [NEW_CHANNEL];
-zobacz [[INFO_URL] aby uzyskać więcej informacji o tej aktualizacji]
+zobacz [[INFO_URL] Więcej informacji o tej aktualizacji]
 		<usetemplate name="okcancelbuttons" notext="Później..." yestext="Instaluj teraz i zrestartuj [APP_NAME]"/>
 	</notification>
 	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
 		Została pobrana wymagana aktualizacja.
 Wersja [VERSION]
 Ta eksperymentalna przeglądarka została zastąpiona przez wersję [NEW_CHANNEL];
-zobacz [[INFO_URL] aby uzyskać więcej informacji o tej aktualizacji]
+zobacz [[INFO_URL] Więcej informacji o tej aktualizacji]
 
 W celu instalacji aktualizacji [APP_NAME] musi zostać zrestartowany.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
 		W celu instalacji aktualizacji [APP_NAME] musi zostać zrestartowany.
 Ta eksperymentalna przeglądarka została zastąpiona przez wersję [NEW_CHANNEL];
-zobacz [[INFO_URL] aby uzyskać więcej informacji o tej aktualizacji]
-		<usetemplate name="okbutton" yestext="OK"/>
+zobacz [[INFO_URL] Więcej informacji o tej aktualizacji]
 	</notification>
 	<notification name="DeedObjectToGroup">
-		Przekazanie tego obiektu spowoduje, że grupa:
+		Przypisanie tego obiektu spowoduje, że grupa:
 * Otrzyma L$ zapłacone temu obiektowi
-		<usetemplate ignoretext="Proszę potwierdzić decyzję przed przypisaniem obiektu do grupy" name="okcancelignore" notext="Anuluj" yestext="Przekaż"/>
+		<usetemplate ignoretext="Potwierdź decyzję przypisania obiektu do grupy" name="okcancelignore" notext="Anuluj" yestext="Przekaż"/>
 	</notification>
 	<notification name="WebLaunchExternalTarget">
 		Czy chcesz otworzyć swoją przeglądarkę internetową by zobaczyć zawartość?
 Otwieranie stron internetowych z nieznanego źródła może narazić Twój komputer na niebezpieczeństwo.
-		<usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć stronę internetową" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć stronę" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="WebLaunchJoinNow">
 		By dokonać zmian i aktualizacji swojego konta, odwiedź [http://secondlife.com/account/ Tablicę].
-		<usetemplate ignoretext="Uruchom przeglądarkę internetową by dokonać zmian w konfiguracji mojego konta" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Uruchom przeglądarkę internetową by dokonać zmian w konfiguracji mojego konta" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="WebLaunchSecurityIssues">
 		Odwiedź [CURRENT_GRID] Wiki i zobacz jak zgłaszać problemy z bezpieczeństwem danych.
-		<usetemplate ignoretext="Uruchom przeglądarkę internetową by dowiedzieć się więcej na temat zgłaszania problemów bezpieczeństwa" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Uruchom przeglądarkę internetową by dowiedzieć się więcej na temat zgłaszania problemów bezpieczeństwa" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="WebLaunchQAWiki">
 		Odwiedź [CURRENT_GRID] Wiki pytań i odpowiedzi.
-		<usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć QA Wiki" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć QA Wiki" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="WebLaunchPublicIssue">
 		Odwiedź [CURRENT_GRID] katalog publicznych problemów, gdzie możesz zgłaszać błędy i inne problemy.
-		<usetemplate ignoretext="Uruchom przeglądarkę internetową by wysłać Błędy klienta" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Uruchom przeglądarkę internetową by wysłać Błędy klienta" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="WebLaunchSupportWiki">
 		Otwórz oficjalny blog Lindenów żeby zobaczyć nowe wiadomości i informacje.
-		<usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć blog" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć blog" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="WebLaunchLSLGuide">
 		Czy chcesz otworzyć samouczek Języka skryptowania?
-		<usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć samouczek Języka skryptowania" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Uruchom przeglądarkę internetową by zobaczyć samouczek Języka skryptowania" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="WebLaunchLSLWiki">
 		Czy na pewno chcesz odwiedzić portal skrypterów LSL?
@@ -1572,16 +1525,15 @@ Otwieranie stron internetowych z nieznanego źródła może narazić Twój kompu
 		Czy na pewno chcesz zwrócić wybrane obiekty do ich właścicieli? Wszystkie udostępnione obiekty z prawem transferu zostaną zwrócone poprzednim właścicielom.
 
 *UWAGA* Wszystkie udostępnione obiekty bez prawa transferu zostaną usunięte!
-		<usetemplate ignoretext="Potwierdź zanim zwrócisz obiekty do ich właścicieli" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Potwierdź zanim zwrócisz obiekty do ich właścicieli" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="GroupLeaveConfirmMember">
 		Jesteś członkiem grupy &lt;nolink&gt;[GROUP]&lt;/nolink&gt;.
 Chcesz ją opuścić?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="OwnerCannotLeaveGroup">
 		Nie możesz opuścić tej grupy, ponieważ jesteś ostatnim z jej właścicieli. Przydziel najpierw innemu użytkownikowi rolę właściciela.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmKick">
 		Na pewno chcesz wyrzucić wszystkich Rezydentów z siatki?
@@ -1589,26 +1541,22 @@ Chcesz ją opuścić?
 	</notification>
 	<notification name="MuteLinden">
 		Przepraszamy, ale nie możesz zablokować Lindena.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CannotStartAuctionAlreadyForSale">
 		Aukcja nie może zostać rozpoczęta dla działki, która została już wcześniej wystawiona na sprzedaż. Dezaktywuj opcję sprzedaży działki, jeżeli chcesz rozpocząć aukcję.
 	</notification>
-	<notification label="Zablokuj obiekty według nazwy" name="MuteByNameFailed">
+	<notification label="Blokowanie obiektów według nazwy nie powiodło się" name="MuteByNameFailed">
 		Rezydent/obiekt jest już zablokowany.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RemoveItemWarn">
 		Pomimo, że jest to dozwolone, usunięcie zawartości może uszkodzić obiekt. Chcesz usunąć?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="CantOfferCallingCard">
 		Nie możesz dać wizytówki w tym momencie. Spróbuj jeszcze raz za chwilę.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CantOfferFriendship">
 		Nie możesz zaoferować znajomości w tym momencie. Spróbuj jeszcze raz za chwilę.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DoNotDisturbModeSet">
 		Tryb Zajętości jest włączony. Nie będziesz powiadamiany/a o nadchodzących rozmowach.
@@ -1616,22 +1564,22 @@ Chcesz ją opuścić?
 - Inni Rezydenci będą otrzymywać Twoją wiadomość Trybu Zajętości (Ustawienia &gt; Prywatność &gt; Autoodpowiedzi).
 - Propozycje teleportacji będą odrzucane.
 - Propozycje rozmów głosowych będą odrzucane.
-		<usetemplate ignoretext="Status zmieniony na Tryb Zajętości" name="okignore" yestext="OK"/>
+		<usetemplate ignoretext="Status zmieniony na Tryb Zajętości" name="okignore" />
 	</notification>
 	<notification name="AutorespondModeSet">
 		Tryb Autoodpowiedzi jest włączony.
 Wiadomości przychodzące będą teraz otrzymywać skonfigurowaną wcześniej automatyczną odpowiedź.
-		<usetemplate ignoretext="Status zmieniony na Tryb Autoodpowiedzi" name="okignore" yestext="OK"/>
+		<usetemplate ignoretext="Status zmieniony na Tryb Autoodpowiedzi" name="okignore" />
 	</notification>
 	<notification name="AutorespondNonFriendsModeSet">
 		Tryb Autoodpowiedzi dla nieznajomych jest włączony.
 Wiadomości przychodzące od osób spoza listy znajomych będą teraz otrzymywać skonfigurowaną wcześniej automatyczną odpowiedź.
-		<usetemplate ignoretext="Status zmieniony na Tryb Autoodpowiedzi dla nieznajomych" name="okignore" yestext="OK"/>
+		<usetemplate ignoretext="Status zmieniony na Tryb Autoodpowiedzi dla nieznajomych" name="okignore" />
 	</notification>
 	<notification name="RejectTeleportOffersModeSet">
 		Tryb odrzucania wszystkich propozycji i próśb o teleportację jest włączony.
 Wszystkie nadchodzące propozycje i prośby o teleportację będą teraz otrzymywać skonfigurowaną wcześniej automatyczną odpowiedź. Nie będziesz dostawać żadnego powiadomienia o tym fakcie.
-		<usetemplate ignoretext="Status zmieniony na odrzucanie wszystkich propozycji i próśb o teleportację" name="okignore" yestext="OK"/>
+		<usetemplate ignoretext="Status zmieniony na odrzucanie wszystkich propozycji i próśb o teleportację" name="okignore" />
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Należysz już do maksymalnej ilości grup. Opuść proszę przynajmniej jedną grupę żeby przyjąć członkostwo w tej grupie, albo odmów.
@@ -1640,7 +1588,6 @@ Wszystkie nadchodzące propozycje i prośby o teleportację będą teraz otrzymy
 	</notification>
 	<notification name="JoinedTooManyGroups">
 		Należysz już do maksymalnej ilości grup. Opuść proszę przynajmniej jedną grupę żeby przyjąć członkostwo w tej grupie, albo odmów.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="KickUser">
 		Wyrzuć tego Rezydenta, wysyłając następujący komunikat.
@@ -1648,7 +1595,6 @@ Wszystkie nadchodzące propozycje i prośby o teleportację będą teraz otrzymy
 			<input name="message">
 				Administrator wylogował Cię.
 			</input>
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
@@ -1658,7 +1604,6 @@ Wszystkie nadchodzące propozycje i prośby o teleportację będą teraz otrzymy
 			<input name="message">
 				Administrator wylogował Cię.
 			</input>
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
@@ -1668,7 +1613,6 @@ Wszystkie nadchodzące propozycje i prośby o teleportację będą teraz otrzymy
 			<input name="message">
 				Unieruchomiono Cię. Nie możesz się ruszać ani rozmawiać. Administrator skontaktuje się z Tobą poprzez IM.
 			</input>
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
@@ -1678,7 +1622,6 @@ Wszystkie nadchodzące propozycje i prośby o teleportację będą teraz otrzymy
 			<input name="message">
 				Odblokowano Cię.
 			</input>
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
@@ -1737,21 +1680,18 @@ Czy chcesz go usunąć?
 			<input name="message">
 				Zapraszam do siebie. Region: [REGION]
 			</input>
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
 	<notification name="TeleportRequestPrompt">
 		Poproś [NAME] o teleport z następującą wiadomością
 		<form name="form">
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
 	<notification name="TooManyTeleportOffers">
 		Próbujesz wysłać [OFFERS] ofert teleportu,
 co przekracza limit [LIMIT].
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="OfferTeleportFromGod">
 		Wysłać propozycję teleportacji do Twojego miejsca?
@@ -1759,7 +1699,6 @@ co przekracza limit [LIMIT].
 			<input name="message">
 				Zapraszam do siebie. Region: [REGION]
 			</input>
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
@@ -1783,11 +1722,9 @@ co przekracza limit [LIMIT].
 		Teleportować do [HISTORY_ENTRY]?
 		<usetemplate ignoretext="Potwierdź teleportację do lokalizacji z historii" name="okcancelignore" notext="Anuluj" yestext="Teleportuj"/>
 	</notification>
-	<notification label="Wiadomość do Wszystkich w Twoim Majątku" name="MessageEstate">
+	<notification label="Wiadomość do wszystkich w Twoim Majątku" name="MessageEstate">
 		Wpisz krótką wiadomość która zostanie wysłana do wszystkich osób w Twoim majątku.
 		<form name="form">
-			<input name="message"/>
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
@@ -1797,16 +1734,16 @@ co przekracza limit [LIMIT].
 Jest to wyjątkowo niebezpieczna decyzja, odczuwalna przez wszystkich Rezydentów. Dla regionu głównego, spowoduje to zmianę tysięcy regionów oraz ich przestrzeń serwerową, spowoduje lagi.
 
 Kontynuować?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
-	<notification label="Zmiana Dostępu do Majątku Lindenów" name="ChangeLindenAccess">
+	<notification label="Zmiana dostępu do Majątku Lindenów" name="ChangeLindenAccess">
 		Dokonujesz zmiany w liście dostępu Regionu głównego należącego do Lindenów (Regiony Główne, Teen Grid, Orientacja).
 
 Żądana operacja jest wyjątkowo niebezpieczna dla wszystkich Rezydentów przebywających w regionie i powinna być używana wyłącznie w celu zablokowania opcji pozwalającej na przeniesienie obiektów/L$ do/z sieci.
 Dodatkowo, zmiany dokonane w Regionie Głównym mogą spowodować problemy przestrzeni serwerowej innych regionów.
 
 Kontynuować?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification label="Wybierz Majątek" name="EstateAllowedAgentAdd">
 		Dodać do listy dostępu tylko do tego majątku czy do [ALL_ESTATES]?
@@ -1842,23 +1779,23 @@ Kontynuować?
 	</notification>
 	<notification label="Potwierdź Wyrzucenie" name="EstateKickUser">
 		Wyrzucić [EVIL_USER] z tego majątku?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification label="Potwierdź Wyrzucenie" name="EstateKickMultiple">
 		Wyrzucić poniższych rezydentów z tego majątku?
 
 [RESIDENTS]
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification label="Potwierdź odesłanie na Start" name="EstateTeleportHomeUser">
 		Odesłać [AVATAR_NAME] do miejsca startu?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification label="Potwierdź odesłanie na Start" name="EstateTeleportHomeMultiple">
 		Odesłać poniższych rezydentów do miejsc startu?
 
 [RESIDENTS]
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification label="Potwierdź bana" name="EstateBanUser">
 		Zabronić dostępu rezydentowi [EVIL_USER] tylko do tego Majątku, czy do [ALL_ESTATES]?
@@ -1872,23 +1809,19 @@ Kontynuować?
 	</notification>
 	<notification name="EstateChangeCovenant">
 		Na pewno chcesz zmienić treść umowy dla tego majątku?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
 		Mamy trudności techniczne z Twoim wejściem w region, ponieważ Twoje preferencje są rozsynchronizowane z serwerem.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
 		Mamy trudności techniczne z Twoim teleportem, ponieważ Twoje preferencje są rozsynchronizowane z serwerem.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
 		Region, który próbujesz odwiedzić zawiera treści przekraczające Twoje bieżące preferencje. Możesz je zmienić używając Awatar &gt; Ustawienia &gt; Ogólne.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="TeleportEntryAccessBlocked">
 		Region, który próbujesz odwiedzić zawiera treści przekraczające Twoje bieżące preferencje. Możesz je zmienić używając Awatar &gt; Ustawienia &gt; Ogólne.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
 		Region, który próbujesz odwiedzić zawiera treści [REGIONMATURITY], które są dostępne tylko dla dorosłych.
@@ -1987,7 +1920,6 @@ Kontynuować?
 	</notification>
 	<notification name="ProblemImportingEstateCovenant">
 		Problem z importem umowy majątku.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="ProblemAddingEstateManager">
 		Problemy z dodawaniem nowego zarządcy majątku. Jeden lub więcej majątków może mieć wypełnioną listę zarządców.
@@ -2000,21 +1932,18 @@ Kontynuować?
 	</notification>
 	<notification name="UnableToLoadNotecardAsset">
 		Brak możliwości załadowania noty w tej chwili.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="NotAllowedToViewNotecard">
 		Niewystarczające prawa do zobaczenia notki przypisanej do wybranego ID.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="MissingNotecardAssetID">
-		ID notki nie znalezione w bazie danych.
-		<usetemplate name="okbutton" yestext="OK"/>
+		ID notki nie zostało znalezione w bazie danych.
 	</notification>
 	<notification name="PublishClassified">
 		Pamiętaj: Opłaty za reklamę są bezzwrotne.
 
 Zamieścić tą reklamę za [AMOUNT]L$?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="SetClassifiedMature">
 		Czy ta reklama zawiera treść Moderate?
@@ -2026,13 +1955,11 @@ Zamieścić tą reklamę za [AMOUNT]L$?
 	</notification>
 	<notification label="Potwierdź Restart" name="ConfirmRestart">
 		Na pewno chcesz zrobić restart tego regionu?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
-	<notification label="Wiadomość do Wszystkich w tym Regionie" name="MessageRegion">
+	<notification label="Wiadomość do wszystkich w tym Regionie" name="MessageRegion">
 		Wpisz krótką wiadomość która zostanie wysłana do wszystkich osób w tym regionie.
 		<form name="form">
-			<input name="message"/>
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
@@ -2061,7 +1988,7 @@ Zostaniesz właścicielem tego obiektu z następującymi prawami:
  Modyfikacje: [MODIFYPERM]
  Kopiowanie: [COPYPERM]
  Odsprzedawanie i oddawanie: [RESELLPERM]
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="BuyOriginalNoOwner">
 		Kupić oryginalny obiekt za [PRICE]L$?
@@ -2069,7 +1996,7 @@ Zostaniesz właścicielem tego obiektu z następującymi prawami:
  Modyfikacje: [MODIFYPERM]
  Kopiowanie: [COPYPERM]
  Odsprzedawanie i oddawanie: [RESELLPERM]
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="BuyCopy">
 		Kupić kopię obiektu od [OWNER] za [PRICE]L$?
@@ -2077,7 +2004,7 @@ Obiekt zostanie skopiowany do Twojej szafy z następującymi prawami:
  Modyfikacje: [MODIFYPERM]
  Kopiowanie: [COPYPERM]
  Odsprzedawanie i oddawanie: [RESELLPERM]
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="BuyCopyNoOwner">
 		Kupić kopię obiektu za [PRICE]L$?
@@ -2085,24 +2012,24 @@ Obiekt zostanie skopiowany do Twojej szafy z następującymi prawami:
  Modyfikacje: [MODIFYPERM]
  Kopiowanie: [COPYPERM]
  Odsprzedawanie i oddawanie: [RESELLPERM]
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="BuyContents">
 		Kupić zawartość od [OWNER] za [PRICE]L$?
 Zawartość zostanie skopiowana do Twojej szafy.
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="BuyContentsNoOwner">
 		Kupić zawartość za [PRICE]L$?
 Zawartość zostanie skopiowana do Twojej szafy.
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmPurchase">
 		Ta transakcja spowoduje:
 [ACTION]
 
 Na pewno chcesz dokonać tego zakupu?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmPurchasePassword">
 		Ta transakcja spowoduje:
@@ -2111,22 +2038,20 @@ Na pewno chcesz dokonać tego zakupu?
 Na pewno chcesz dokonać tego zakupu?
 Wpisz hasło ponownie i kliknij na OK.
 		<form name="form">
-			<input name="message"/>
-			<button name="ConfirmPurchase" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
 	<notification name="SetPickLocation">
 		Uwaga:
 Lokalizacja tego miejsca została zaktualizowana, ale pozostałe szczegóły zachowają oryginalne wartości.
-		<usetemplate name="okbutton" yestext="OK"/>
+		
 	</notification>
 	<notification name="MoveInventoryFromObject">
 		Wybrane obiekty Szafy nie mają praw kopiowania.
 Obiekty zostaną przeniesione do Twojej Szafy, nie zostaną skopiowane.
 
 Przenieść obiekty Szafy?
-		<usetemplate ignoretext="Uprzedź przed przeniesieniem zawartości niekopiowalnej z obiektu" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Uprzedź przed przeniesieniem zawartości niekopiowalnej z obiektu" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="MoveInventoryFromScriptedObject">
 		Wybrane obiekty Szafy nie mają praw kopiowania.
@@ -2134,7 +2059,7 @@ Obiekty zostaną przeniesione do Twojej Szafy, nie zostaną skopiowane.
 Ponieważ obiekty zawierają skrypty, przeniesienie obiektów do Twojej Szafy może spowodować niepoprawne działanie skryptów.
 
 Przenieść obiekty szafy?
-		<usetemplate ignoretext="Uprzedź przed przeniesieniem zawartości niekopiowalnej z obiektu, która może uszkodzić skrypty obiektu" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Uprzedź przed przeniesieniem zawartości niekopiowalnej z obiektu, które może uszkodzić skrypty obiektu" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="ClickActionNotPayable">
 		Uwaga: Opcja &apos;Zapłać obiektowi&apos; została wybrana, ale żeby ta opcja działała musi być dodany skrypt z funkcją money().
@@ -2151,27 +2076,27 @@ Przenieść obiekty szafy?
 	</notification>
 	<notification name="ConfirmAddingChatParticipants">
 		Po dodaniu osoby do istniejącej rozmowy - nowa rozmowa zostanie utworzona. Wszyscy uczestnicy otrzymają powiadomienie o nowej rozmowie.
-		<usetemplate ignoretext="Potwierdź dodanie uczestników rozmowy" name="okcancelignore" notext="Anuluj" yestext="Ok"/>
+		<usetemplate ignoretext="Potwierdź dodanie uczestników rozmowy" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmQuit">
 		Na pewno chcesz zakończyć?
-		<usetemplate ignoretext="Na pewno chcesz zakończyć?" name="okcancelignore" notext="Nie kończ" yestext="Wyłącz" canceltext="Nie kończ"/>
+		<usetemplate ignoretext="Na pewno chcesz zakończyć?" name="okcancelignore" notext="Nie kończ" yestext="Wyłącz"/>
 	</notification>
 	<notification name="ConfirmRestoreToybox">
 		Ta akcja przywróci domyślny układ przycisków i pasków.
 
 Nie możesz tego cofnąć.
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmClearAllToybox">
 		Ta akcja usunie wszystkie przyciski z pasków, będą one puste.
 
 Nie możesz tego cofnąć.
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="DeleteItems">
 		[QUESTION]
-		<usetemplate ignoretext="Potwierdź, że na pewno chcesz skasować obiekty" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Potwierdź, że na pewno chcesz skasować obiekty" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="HelpReportAbuseEmailLL">
 		Używaj tej opcji do zgłaszania nadużyć [http://secondlife.com/corporate/tos.php Warunków Umowy (Terms of Service)] i [http://secondlife.com/corporate/cs.php Standardów Społeczeństwa (Community Standards)].
@@ -2204,7 +2129,7 @@ Dokładne dane pomogą nam w klasyfikacji i przetwarzaniu raportu.
 
 Jeżeli składasz raport dotyczący naruszenia praw autorskich proszę się upewnić, że robisz to poprawnie:
 
-(1) Przypadek Nadużycia. Możesz złożyć raport jeżeli sądzisz, że Rezydent narusza system przywilejów [CURRENT_GRID], na przykład używając CopyBot lub podobnych narzędzi robiących kopie, naruszając prawa autorskie. Komisja Nadużyć bada wykroczenia i stosuje akcje dyscyplinarne za zachowania sprzeczne z zasadami Warunków Umowy [CURRENT_GRID] [http://secondlife.com/corporate/tos.php Terms of Service] i Standardów Społeczeństwa [http://secondlife.com/corporate/cs.php Community Standards]. Komisja Nadużyć nie zajmuje się i nie odpowiada na żądania usunięcia treści ze środowiska [CURRENT_GRID].
+(1) Przypadek Nadużycia. Możesz złożyć raport jeżeli sądzisz, że Rezydent narusza system przywilejów [CURRENT_GRID], na przykład używając CopyBot lub podobnych narzędzi robiących kopie, naruszając prawa autorskie. Komisja Nadużyć bada wykroczenia i stosuje akcje dyscyplinarne za zachowania sprzeczne z zasadami Warunków Umowy [http://secondlife.com/corporate/tos.php Warunków Umowy] i [http://secondlife.com/corporate/cs.php Standardów Społeczeństwa] w [CURRENT_GRID]. Komisja Nadużyć nie zajmuje się i nie odpowiada na żądania usunięcia treści ze środowiska [CURRENT_GRID].
 
 (2) Przypadek DMCA lub Usuwanie Treści. Aby wystąpić z żądaniem o usunięcie treści ze środowiska [CURRENT_GRID] MUSISZ przedłożyć ważne zawiadomienie o nadużyciu zgodne z naszą polityką DMCA [http://secondlife.com/corporate/dmca.php DMCA Policy].
 
@@ -2223,7 +2148,7 @@ Linden Lab
 Chcesz go zamienić na wybrany obiekt?
 		<form name="form">
 			<ignore name="ignore" text="Zamień dodatek z wybranym obiektem"/>
-			<button ignore="Zamień automatycznie" name="Yes" text="OK"/>
+			<button ignore="Zamień automatycznie" name="Yes"/>
 			<button ignore="Nie zamieniaj" name="No" text="Anuluj"/>
 		</form>
 	</notification>
@@ -2233,33 +2158,33 @@ Chcesz go zamienić na wybrany obiekt?
 Chcesz wyłączyć Tryb Zajętości przed zakończeniem tej transakcji?
 		<form name="form">
 			<ignore name="ignore" text="Chcę zapłacić w Trybie Zajętości"/>
-			<button ignore="Zawsze wyłączaj tryb Zajętości" name="Yes" text="OK"/>
+			<button ignore="Zawsze wyłączaj tryb Zajętości" name="Yes"/>
 			<button ignore="Nigdy nie wyłączaj trybu Zajętości" name="No" text="Anuluj"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
 		Ten folder &apos;[FOLDERNAME]&apos; to folder systemowy. Usunięcie folderu systemowego spowoduje niestabilność. Czy na pewno chcesz go skasować?
-		<usetemplate ignoretext="Potwierdź zanim folder systemu zostanie skasowany" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Potwierdź zanim folder systemu zostanie skasowany" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmEmptyTrash">
 		Na pewno chcesz permanentnie usunąć zawartość Kosza?
-		<usetemplate ignoretext="Potwierdź przed usunięciem zawartości Kosza" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Potwierdź przed usunięciem zawartości Kosza" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmClearBrowserCache">
 		Na pewno chcesz wyczyścić bufory przeglądarki internetowej, wyszukiwania i podróży?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmClearCache">
 		Na pewno chcesz wyczyścić bufor Przeglądarki?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmClearInventoryCache">
 		Na pewno chcesz wyczyścić bufor Szafy?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmClearWebBrowserCache">
 		Na pewno chcesz wyczyścić bufor wbudowanej przeglądarki internetowej?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmClearCookies">
 		Na pewno chcesz wyczyścić ciasteczka?
@@ -2275,7 +2200,7 @@ Chcesz wyłączyć Tryb Zajętości przed zakończeniem tej transakcji?
 	</notification>
 	<notification name="CopySLURL">
 		Następujący link SLurl został skopiowany do schowka:
- [SLURL]
+[SLURL]
 
 Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do tego miejsca, albo wklej go do panelu adresu Twojej przeglądarki, żeby go otworzyć.
 		<form name="form">
@@ -2297,15 +2222,12 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
 	</notification>
 	<notification name="EnvCannotDeleteLastDayCycleKey">
 		Nie można usunąć ostatniego klucza w cyklu dnia, bo nie może on być pusty. Zmodyfikuj ten klucz zamiast go usuwać, a potem dodaj nowy.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DayCycleTooManyKeyframes">
 		Nie możesz dodać więcej klatek kluczowych w tym cyklu dnia. Maksymalna liczba klatek kluczowych zakresu [SCOPE] wynosi [MAX].
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="EnvUpdateRate">
 		Możesz aktualizować ustawienia otoczenia co [WAIT] sekund. Poczekaj przynajmniej tyle i spróbuj ponownie.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="PPSaveEffectAlert">
 		Efekt post-procesu już istnieje. Chcesz ciągle go nadpisać?
@@ -2314,24 +2236,16 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
 	<notification name="ChatterBoxSessionStartError">
 		Błąd podczas rozpoczynania czatu/IM z [RECIPIENT].
 [REASON]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ChatterBoxSessionEventError">
-		[EVENT]
-<!--[REASON]-->
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="ForceCloseChatterBoxSession">
 		Twój czat/IM z [NAME] zostanie zamknięty.
 [REASON]
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="Cannot_Purchase_an_Attachment">
 		Rzeczy nie mogą być kupione jeżeli są częścią dodatku.
 	</notification>
 	<notification label="Prośba o Zgodę na Pobieranie L$" name="DebitPermissionDetails">
 		Akceptując tą prośbę wyrażasz zgodę na ciągłe pobieranie Lindenów (L$) z Twojego konta. Żeby cofnąć to pozwolenie właściciel obiektu będzie musiał usunąć ten obiekt albo zresetować skrypty obiektu.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="AutoWearNewClothing">
 		Czy chcesz automatycznie nosić ubranie które tworzysz?
@@ -2339,7 +2253,7 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
 	</notification>
 	<notification name="NotAgeVerified">
 		Miejsce, które próbujesz odwiedzić jest dostępne dla osób mających 18 lat lub więcej.
-		<usetemplate ignoretext="Nie mam odpowiedniego wieku do odwiedzania ograniczonych wiekowo stref" name="okignore" yestext="OK"/>
+		<usetemplate ignoretext="Nie mam odpowiedniego wieku do odwiedzania ograniczonych wiekowo stref" name="okignore" />
 	</notification>
 	<notification name="NotAgeVerified_Notify">
 		Miejsce dostępne dla osób mających 18 lat lub więcej.
@@ -2348,9 +2262,6 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t
 		Nie masz dostępu do tej działki ze względu na brak danych płatniczych o Twoim koncie. Czy chcesz odwiedzić stronę [CURRENT_GRID] żeby to zmienić?
 
 [_URL]
-		<url name="url">
-			https://secondlife.com/account/
-		</url>
 		<usetemplate ignoretext="Brak danych płatniczych o koncie" name="okcancelignore" notext="Nie" yestext="Tak"/>
 	</notification>
 	<notification name="MissingString">
@@ -2639,7 +2550,7 @@ Jeżeli chcesz odtwarzać media na tej działce, które używają QuickTime idź
 	</notification>
 	<notification name="MediaPluginFailed">
 		Następujące wtyczki mediów nie działają:
-    [PLUGIN]
+[PLUGIN]
 
 Zainstaluj wtyczki ponownie lub skontaktuj się z dostawcą, jeśli problem nadal będzie występował.
 		<form name="form">
@@ -2693,13 +2604,12 @@ Nie możesz tutaj latać.
 	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Wystąpił błąd. To może być problem sieci, serwera lub Twojego braku praw do budowania. Czasami wylogowanie się i zalogowanie ponownie może naprawić problem.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="SeeAvatars">
 		Ta działka ukrywa czat tekstowy i awatary z innych działek. Nie będziesz widzieć rezydentów na zewnątrz tej działki - ani oni Ciebie. Wspólny kanał czatu 0 również jest zablokowany.
 	</notification>
 	<notification name="ScriptsStopped">
-		Administrator czasowo zatrzymał skrypty w tym regionie.
+		Administrator tymczasowo zatrzymał skrypty w tym regionie.
 	</notification>
 	<notification name="ScriptsNotRunning">
 		Żadne skrypty nie działają w tym regionie.
@@ -2823,16 +2733,12 @@ Chcesz zachować ten obiekt? Wybranie "Zablokuj" sprawi, że nie będziesz już
 		<form name="form">
 			<button name="Join" text="Zaakceptuj"/>
 			<button name="Decline" text="Odmów"/>
-			<button name="Info" text="Info"/>
 		</form>
 	</notification>
 	<notification name="JoinGroupProtectionNotice">
 		Ta grupa pobiera opłatę za dołączenie, nie można zaakceptować zaproszenia ze względu na Twoje ustawienia. Jeśli chcesz to zmienić, otwórz Preferencje -&gt; Firestorm -&gt; Ochrona.
 
 [MESSAGE]
-		<form name="form">
-			<button name="Info" text="Info"/>
-		</form>
 	</notification>
 	<notification name="TeleportOffered" label="Propozycja teleportacji od [NAME_LABEL]">
 		[NAME_SLURL] proponuje Ci teleportację do siebie:
@@ -3028,8 +2934,7 @@ Naciśnij &apos;M&apos; żeby go włączyć.
 Obiekty które tu zbudujesz zostaną usunięte gdy opuścisz ten obszar, a więc nie zapomnij ich zabrać ze sobą - kliknij prawym przyciskiem myszy na obiekcie i wybierz &apos;Weź&apos;.
 	</notification>
 	<notification name="MaxListSelectMessage">
-		Maksymalnie możesz wybrać [MAX_SELECT] rzeczy
-z tej listy.
+		Maksymalnie możesz wybrać [MAX_SELECT] rzeczy z tej listy.
 	</notification>
 	<notification name="VoiceInviteP2P">
 		[NAME] zaprasza Cię do rozmowy głosowej.
@@ -3052,7 +2957,8 @@ Wybierz Zablokuj żeby wyciszyć wszystkie wiadomości od tej osoby.
 	</notification>
 	<notification name="VoiceInviteGroup">
 		[NAME] zaczyna rozmowę głosową z grupą [GROUP].
-Wybierz Zaakceptuj żeby rozmawiać albo Odmów żeby nie przyjąć zaproszenia. Wybierz Zablokuj żeby wyciszyć dzwoniącą osobę.
+Wybierz Zaakceptuj żeby rozmawiać albo Odmów żeby nie przyjąć zaproszenia.
+Wybierz Zablokuj żeby wyciszyć dzwoniącą osobę.
 		<form name="form">
 			<button name="Accept" text="Zaakceptuj"/>
 			<button name="Decline" text="Odmów"/>
@@ -3061,7 +2967,8 @@ Wybierz Zaakceptuj żeby rozmawiać albo Odmów żeby nie przyjąć zaproszenia.
 	</notification>
 	<notification name="VoiceInviteAdHoc">
 		[NAME] zaczyna konferencję głosową.
-Wybierz Zaakceptuj żeby rozmawiać albo Odmów żeby nie przyjąć zaproszenia. Wybierz Zablokuj żeby wyciszyć dzwoniącą osobę.
+Wybierz Zaakceptuj żeby rozmawiać albo Odmów żeby nie przyjąć zaproszenia.
+Wybierz Zablokuj żeby wyciszyć dzwoniącą osobę.
 		<form name="form">
 			<button name="Accept" text="Zaakceptuj"/>
 			<button name="Decline" text="Odmów"/>
@@ -3070,7 +2977,8 @@ Wybierz Zaakceptuj żeby rozmawiać albo Odmów żeby nie przyjąć zaproszenia.
 	</notification>
 	<notification name="InviteAdHoc">
 		[NAME] zaprasza Cię do konferencji poprzez Czat/IM.
-Wybierz Zaakceptuj żeby zacząć czat albo Odmów żeby nie przyjąć zaproszenia. Wybierz Zablokuj żeby wyciszyć tą osobę.
+Wybierz Zaakceptuj żeby zacząć czat albo Odmów żeby nie przyjąć zaproszenia.
+Wybierz Zablokuj żeby wyciszyć tą osobę.
 		<form name="form">
 			<button name="Accept" text="Zaakceptuj"/>
 			<button name="Decline" text="Odmów"/>
@@ -3149,7 +3057,7 @@ Zostaną zablokowane na kilka sekund dla bezpieczeństwa.
 	</notification>
 	<notification name="ConfirmCloseAll">
 		Czy chcesz zamknąć wszystkie wiadomości IM?
-		<usetemplate ignoretext="Potwierdź przed zamknięciem wszystkich wiadomości prywatnych (IM)." name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Potwierdź przed zamknięciem wszystkich wiadomości prywatnych (IM)." name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="AttachmentSaved">
 		Załącznik został zapisany.
@@ -3160,15 +3068,12 @@ Zostaną zablokowane na kilka sekund dla bezpieczeństwa.
 	<notification name="ObjectMediaFailure">
 		Błąd serwera: aktualizacja mediów nie powiodła się.
 &apos;[ERROR]&apos;
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="TextChatIsMutedByModerator">
 		Twój czat został wyciszony przez moderatora.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="VoiceIsMutedByModerator">
 		Twoja rozmowa głosowa została wyciszona przez moderatora.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="UploadCostConfirmation">
 		Załadowanie tego na serwer będzie kosztować [PRICE]L$, chcesz kontynuować?
@@ -3176,7 +3081,7 @@ Zostaną zablokowane na kilka sekund dla bezpieczeństwa.
 	</notification>
 	<notification name="ConfirmClearTeleportHistory">
 		Czy na pewno chcesz usunąć historię teleportacji?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="BottomTrayButtonCanNotBeShown">
 		Wybrany przycisk nie może zostać wyświetlony w tej chwili.
@@ -3204,7 +3109,7 @@ Zobacz log, aby dowiedzieć się więcej.
 następującym Rezydentom:
 
 &lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
-		<usetemplate ignoretext="Potwierdź, kiedy dzielę się przedmiotem" name="okcancelignore" notext="Anuluj" yestext="Ok"/>
+		<usetemplate ignoretext="Potwierdź, kiedy dzielę się przedmiotem" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="ShareFolderConfirmation">
 		Możesz się podzielić tylko jednym folderem jednocześnie.
@@ -3216,7 +3121,7 @@ Czy na pewno chcesz udostępnić następujące obiekty:
 następującym Rezydentom:
 
 &lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Ok"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="ItemsShared">
 		Obiekty zostały udostępnione.
@@ -3273,7 +3178,6 @@ Awatar &apos;[NAME]&apos; opuścił edycję wyglądu.
 	<notification name="NoConnect">
 		Występuje problem z połączeniem [PROTOCOL] [HOSTID].
 Proszę sprawdź swoją sieć i ustawienia firewall.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="NoVoiceConnect">
 		Występuje problem z Twoim połączeniem głosowym:
@@ -3282,7 +3186,7 @@ Proszę sprawdź swoją sieć i ustawienia firewall.
 
 Komunikacja głosowa nie będzie dostępna.
 Proszę sprawdź swoją sieć i ustawienia firewall.
-		<usetemplate name="okignore" ignoretext="Ostrzegaj mnie, gdy przeglądarka nie może połączyć się z serwerem głosu" yestext="OK"/>
+		<usetemplate name="okignore" ignoretext="Ostrzegaj mnie, gdy przeglądarka nie może połączyć się z serwerem głosu" />
 	</notification>
 	<notification name="AvatarRezLeftNotification">
 		( [EXISTENCE] sekund w Second Life)
@@ -3290,15 +3194,15 @@ Awatar &apos;[NAME]&apos; pozostał w pełni załadowany.
 	</notification>
 	<notification name="AvatarRezSelfBakedTextureUploadNotification">
 		( [EXISTENCE] sekund w Second Life )
-Wstępne przetworzone tekstury [RESOLUTION] dla &apos;[BODYREGION]&apos; zostały załadowane po [TIME] sekundach.
+Wstępnie przetworzone tekstury [RESOLUTION] dla &apos;[BODYREGION]&apos; zostały załadowane po [TIME] sekundach.
 	</notification>
 	<notification name="AvatarRezSelfBakedTextureUpdateNotification">
 		( [EXISTENCE] sekund w Second Life )
-Wstępne przetworzone tekstury [RESOLUTION] zostały lokalnie zaktualizowane dla &apos;[BODYREGION]&apos; po [TIME] sekundach.
+Wstępnie przetworzone tekstury [RESOLUTION] zostały lokalnie zaktualizowane dla &apos;[BODYREGION]&apos; po [TIME] sekundach.
 	</notification>
 	<notification name="LivePreviewUnavailable">
 		Nie można wyświetlić podglądu tej tekstury - jest niekopiowalna lub/oraz nietransferowalna.
-		<usetemplate ignoretext="Ostrzegaj, gdy podgląd na żywo nie może wyświetlić niekopiowalnych/nietransferowalnych tekstur" name="okignore" yestext="OK"/>
+		<usetemplate ignoretext="Ostrzegaj, gdy podgląd na żywo nie może wyświetlić niekopiowalnych/nietransferowalnych tekstur" name="okignore" />
 	</notification>
 	<notification name="ConfirmLeaveCall">
 		Czy jesteś pewien/pewna, że chcesz zakończyć rozmowę?
@@ -3310,7 +3214,7 @@ To spowoduje również wyciszenie wszystkich Rezydentów, którzy dołączą pó
 do rozmowy nawet, jeśli ją zakończysz.
 
 Wyciszyć wszystkich?
-		<usetemplate ignoretext="Potwierdź zanim zostaną wyciszeni wszyscy uczestnicy rozmowy głosowej w grupie" name="okcancelignore" notext="Anuluj" yestext="Ok"/>
+		<usetemplate ignoretext="Potwierdź zanim zostaną wyciszeni wszyscy uczestnicy rozmowy głosowej w grupie" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification label="Czat" name="HintChat">
 		W celu przyłączenia się do rozmowy zacznij pisać w poniższym polu czatu.
@@ -3368,51 +3272,39 @@ Kliknij i przeciągnij gdziekolwiek aby obrócić widok.
 	</notification>
 	<notification name="SOCKS_NOT_PERMITTED">
 		Serwer proxy SOCKS 5 "[HOST]:[PORT]" odmawia połączenia, brak dostępu na podstawie zestawu reguł.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="SOCKS_CONNECT_ERROR">
 		Serwer proxy SOCKS 5 "[HOST]:[PORT]" odmawia połączenia, nie można otworzyć kanału TCP.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="SOCKS_NOT_ACCEPTABLE">
 		Serwer proxy SOCKS 5 "[HOST]:[PORT]" odmówił połączenia na ustawionym sposobie autoryzacji.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="SOCKS_AUTH_FAIL">
 		Serwer proxy SOCKS 5 "[HOST]:[PORT]" określił Twoje dane uwierzytelniające jako nieprawidłowe.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="SOCKS_UDP_FWD_NOT_GRANTED">
 		Serwer proxy SOCKS 5 "[HOST]:[PORT]" odmówił skojarzonego żądania UDP.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="SOCKS_HOST_CONNECT_FAILED">
 		Nie można połączyć z serwerem proxy SOCKS 5 "[HOST]:[PORT]".
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="SOCKS_UNKNOWN_STATUS">
 		Nieznany błąd proxy z serwerem "[HOST]:[PORT]".
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="SOCKS_INVALID_HOST">
 		Nieprawidłowy adres lub port proxy SOCKS "[HOST]:[PORT]".
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="SOCKS_BAD_CREDS">
 		Nieprawidłowy użytkownik lub hasło SOCKS 5.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="PROXY_INVALID_HTTP_HOST">
 		Nieprawidłowy adres lub port proxy HTTP "[HOST]:[PORT]".
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="PROXY_INVALID_SOCKS_HOST">
 		Nieprawidłowy adres lub port proxy SOCKS "[HOST]:[PORT]".
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="ChangeProxySettings">
 		Ustawienia proxy zaczną obowiązywać po restarcie [APP_NAME].
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="AuthRequest">
 		Strona &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; w domenie &apos;[REALM]&apos; wymaga nazwy użytkownika i hasła.
@@ -3473,41 +3365,41 @@ Kliknij i przeciągnij gdziekolwiek aby obrócić widok.
 	</notification>
 	<notification name="ConfirmHideUI">
 		Ta akcja ukryje wszystkie menu i przyciski. Aby je pokazać użyj skrótu [SHORTCUT] ponownie.
-		<usetemplate name="okcancelignore" yestext="OK" notext="Anuluj" ignoretext="Potwierdź przed ukryciem interfejsu"/>
+		<usetemplate name="okcancelignore"  notext="Anuluj" ignoretext="Potwierdź przed ukryciem interfejsu"/>
 	</notification>
 	<notification name="PathfindingLinksets_WarnOnPhantom">
-		Niektórym z zaznaczonych zbiorów części zostanie przełączony status Phantom.
+		Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy.
 
 Czy chcesz kontynuować?
-		<usetemplate ignoretext="Niektórym z zaznaczonych zbiorów części zostanie przełączony status Phantom." name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy." name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="PathfindingLinksets_MismatchOnRestricted">
 		Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]' ze względu na restrykcje zezwoleń zbioru części. Te zbiory części zostaną zamiast tego ustawione na '[RESTRICTED_TYPE]'.
 
 Czy chcesz kontynuować?
-		<usetemplate ignoretext="Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione ze względu na restrykcje zezwoleń zbioru części." name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione ze względu na restrykcje zezwoleń zbioru części." name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="PathfindingLinksets_MismatchOnVolume">
 		Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]', ponieważ kształt nie jest wypukły.
 
 Czy chcesz kontynuować?
-		<usetemplate ignoretext="Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione, ponieważ kształt nie jest wypukły." name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione, ponieważ kształt nie jest wypukły." name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">
-		Niektórym z zaznaczonych zbiorów części zostanie przełączony status Phantom.
+		Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy.
 
 Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]' ze względu na restrykcje zezwoleń zbioru części. Te zbiory części zostaną zamiast tego ustawione na '[RESTRICTED_TYPE]'.
 
 Czy chcesz kontynuować?
-		<usetemplate ignoretext="Niektórym z zaznaczonych zbiorów części zostanie przełączony status Phantom, a inne nie mogą zostać ustawione ze względu na restrykcje zezwoleń zbioru części." name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy, a inne nie mogą zostać ustawione ze względu na restrykcje zezwoleń zbioru części." name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">
-		Niektórym z zaznaczonych zbiorów części zostanie przełączony status Phantom.
+		Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy.
 
 Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]', ponieważ kształt nie jest wypukły.
 
 Czy chcesz kontynuować?
-		<usetemplate ignoretext="Niektórym z zaznaczonych zbiorów części zostanie przełączony status Phantom, a inne nie mogą zostać ustawione, ponieważ kształt nie jest wypukły." name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy, a inne nie mogą zostać ustawione, ponieważ kształt nie jest wypukły." name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">
 		Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]' ze względu na restrykcje zezwoleń zbioru części. Te zbiory części zostaną zamiast tego ustawione na '[RESTRICTED_TYPE]'.
@@ -3515,21 +3407,21 @@ Czy chcesz kontynuować?
 Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]', ponieważ kształt nie jest wypukły. Ich typ nie ulegnie zmianie.
 
 Czy chcesz kontynuować?
-		<usetemplate ignoretext="Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione ze względu na restrykcje zezwoleń zbioru części i niewypukły kształt." name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione ze względu na restrykcje zezwoleń zbioru części i niewypukły kształt." name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">
-		Niektórym z zaznaczonych zbiorów części zostanie przełączony status Phantom.
+		Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy.
 
 Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]' ze względu na restrykcje zezwoleń zbioru części. Te zbiory części zostaną zamiast tego ustawione na '[RESTRICTED_TYPE]'.
 
 Niektóre z zaznaczonych zbiorów części nie mogą zostać ustawione na '[REQUESTED_TYPE]', ponieważ kształt nie jest wypukły. Ich typ nie ulegnie zmianie.
 
 Czy chcesz kontynuować?
-		<usetemplate ignoretext="Niektórym z zaznaczonych zbiorów części zostanie przełączony status Phantom, a inne nie mogą zostać ustawione ze względu na restrykcje zezwoleń zbioru części i niewypukły kształt." name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Niektórym z zaznaczonych zbiorów części zostanie przełączony status Widmowy, a inne nie mogą zostać ustawione ze względu na restrykcje zezwoleń zbioru części i niewypukły kształt." name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
 		Wybrany obiekt ma wpływ na Navmesh. Dodanie elastyczności spowoduje usunięcie go z Navmesha.
-		<usetemplate ignoretext="Wybrany obiekt ma wpływ na Navmesh. Dodanie elastyczności spowoduje usunięcie go z Navmesha." name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Wybrany obiekt ma wpływ na Navmesh. Dodanie elastyczności spowoduje usunięcie go z Navmesha." name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<global name="UnsupportedGLRequirements">
 		Wygląda na to, że Twój system nie spełnia wymagań sprzętowych [APP_NAME]. [APP_NAME] wymaga karty graficznej kompatybilnej z OpenGL z multiteksturami. Jeżeli masz taką kartę zainstaluj najnowsze sterowniki do niej i uaktualnienia systemu operacyjnego.
@@ -3551,19 +3443,19 @@ W innym przypadku możesz poszukać na mapie miejsc oznaczonych jako &quot;Infoh
 	</global>
 	<notification name="ConfirmClearDebugSearchURL">
 		Na pewno chcesz wyczyścić debugowany URL szukania?
-		<usetemplate name="okcancelignore" ignoretext="Czyszczenie debugowanego URL szukania" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelignore" ignoretext="Czyszczenie debugowanego URL szukania" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmPickDebugSearchURL">
 		Na pewno chcesz ustawić obecny URL szukania jako debugowany URL szukania?
-		<usetemplate name="okcancelignore" ignoretext="Potwierdzenie ustawiania debugowanego URL szukania" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelignore" ignoretext="Potwierdzenie ustawiania debugowanego URL szukania" notext="Anuluj" />
 	</notification>
 	<notification name="ConfirmRemoveGrid">
 		Na pewno chcesz usunąć [REMOVE_GRID] z listy siatek?
-		<usetemplate ignoretext="Potwierdzenie usuwania siatki z listy siatek" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Potwierdzenie usuwania siatki z listy siatek" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="CanNotRemoveConnectedGrid">
 		Nie możesz usunąć siatki [REMOVE_GRID], gdy jesteś z nią połączony/a.
-		<usetemplate ignoretext="Ostrzeżenie przed usuwaniem siatki z aktywnym połączeniem" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Ostrzeżenie przed usuwaniem siatki z aktywnym połączeniem" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="FSWL" label="Aplikowanie ustawień Windlight">
 		&apos;[PARCEL_NAME]&apos;, własność [OWNER_NAME], chce zmienić ustawienia otoczenia systemu Windlight.
@@ -3583,19 +3475,18 @@ W innym przypadku możesz poszukać na mapie miejsc oznaczonych jako &quot;Infoh
 			<input name="message">
 				Nowy zestaw AO
 			</input>
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
 	<notification name="NewAOCantContainNonASCII">
 		Nie można utworzyć zestawu AO o nazwie "[AO_SET_NAME]".
 Nazwa może zawierać tylko znaki ASCII, za wyjątkiem ":" oraz "|".
-		<usetemplate name="okbutton" yestext="OK"/>
+		
 	</notification>
 	<notification name="RenameAOMustBeASCII">
 		Nie można zmienić nazwy zestawu AO "[AO_SET_NAME]".
 Nazwa może zawierać tylko znaki ASCII, za wyjątkiem ":" oraz "|".
-		<usetemplate name="okbutton" yestext="OK"/>
+		
 	</notification>
 	<notification name="RemoveAOSet">
 		Usunąć zestaw AO "[AO_SET_NAME]" z listy?
@@ -3672,7 +3563,7 @@ Czy chcesz jej/mu wysłać te informacje?
 		Resetowanie ustawień może się przydać, gdy napotykasz na jakieś problemy - pamiętaj jednak, że trzeba będzie wprowadzić od nowa wszystkie zmiany, jakie zostały przez Ciebie ustawione do tej pory.
 
 Na pewno chcesz zresetować wszystkie ustawienia?
-		<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Anuluj" />
 	</notification>
 	<notification name="SettingsWillClear">
 		Ustawienia zostaną zresetowane po zrestartowaniu [APP_NAME].
@@ -3680,7 +3571,7 @@ Na pewno chcesz zresetować wszystkie ustawienia?
 	<notification name="CantAddGrid">
 		Nie można dodać [GRID] do listy siatek.
 [REASON] skontaktuj się ze wsparciem [GRID].
-		<usetemplate name="okbutton" yestext="OK"/>
+		
 	</notification>
 	<notification name="FirstPhoenixContactSetOpen">
 		To Twój pierwszy raz, gdy otwierasz Zestawy Kontaktów!
@@ -3788,7 +3679,7 @@ Chcesz włączyć automatyczne prezentowanie wersji Przeglądarki?
 	</notification>
 	<notification name="ConfirmScriptModify">
 		Na pewno chcesz zmodyfikować skrypty w zaznaczonych obiektach?
-		<usetemplate ignoretext="Potwierdzenie modyfikacji skryptów w zaznaczeniu" name="okcancelignore" notext="Anuluj" yestext="OK" />
+		<usetemplate ignoretext="Potwierdzenie modyfikacji skryptów w zaznaczeniu" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="LocalBitmapsUpdateFileNotFound">
 		[FNAME] nie może zostać zaktualizowany, ponieważ plik nie może zostać znaleziony.
@@ -3850,8 +3741,7 @@ Anulowano.
 		Nie możesz usiąść, ponieważ nie masz zezwolenia do przebywania na tej ziemi.
 	</notification>
 	<notification name="SitFailNotSameRegion">
-		Spróbuj podejść bliżej. Nie można usiąść na obiekcie,
-bo nie jest w tym samym regionie, co Ty.
+		Spróbuj podejść bliżej. Nie można usiąść na obiekcie, bo nie jest w tym samym regionie, co Ty.
 	</notification>
 	<notification name="ChatHistoryIsBusyAlert">
 		Plik historii czatu jest w tej chwili przetwarzany przez poprzednią operację. Spróbuj ponownie za kilka minut lub wybierz czat innej osoby.
@@ -3884,8 +3774,7 @@ bo nie jest w tym samym regionie, co Ty.
 		Nie można zduplikować obiektów - nie można znaleźć działki, na której one są.
 	</notification>
 	<notification name="CantCreateCuzParcelFull">
-		Nie można utworzyć obiektu,
-ponieważ działka jest pełna.
+		Nie można utworzyć obiektu, ponieważ działka jest pełna.
 	</notification>
 	<notification name="RezAttemptFailed">
 		Próba zrezzowania obiektu nie powiodła się.
@@ -3914,8 +3803,7 @@ Spróbuj ponownie za minutę.
 		Nie masz już dłużej pozwolenia na przebywanie w tym miejscu i w ciągu [EJECT_TIME] sekund musisz je opuścić.
 	</notification>
 	<notification name="NoEnterRegionMaybeFull">
-		Nie możesz wejść do regionu "[NAME]",
-może być pełny lub właśnie restartuje.
+		Nie możesz wejść do regionu "[NAME]", może być pełny lub właśnie restartuje.
 	</notification>
 	<notification name="SaveBackToInvDisabled">
 		Zabieranie z powrotem do Szafy zostało wyłączone.
@@ -4447,15 +4335,15 @@ Spróbuj zaznaczyć mniejszy obszar ziemi.
 	</notification>
 	<notification name="PreferenceChatClearLog">
 		Ta opcja usunie dzienniki poprzednich rozmów i wszelkie kopie zapasowe tego pliku.
-		<usetemplate ignoretext="Potwierdź, zanim usunę dzienniki poprzednich rozmów." name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Potwierdź, zanim usunę dzienniki poprzednich rozmów." name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="PreferenceChatDeleteTranscripts">
 		Ta opcja usunie logi wszystkich poprzednich rozmów. Nie będzie to miało wpływu na listę rozmów odbytych w przeszłości. Wszystkie pliki z przyrostkami .txt oraz txt.backup w folderze [FOLDER] zostaną usunięte.
-		<usetemplate ignoretext="Potwierdź, zanim usunę logi rozmów." name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Potwierdź, zanim usunę logi rozmów." name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="PreferenceChatPathChanged">
 		Nie można przenieść plików. Przywrócono poprzednią ścieżkę.
-		<usetemplate ignoretext="Nie można przenieść plików. Przywrócono poprzednią ścieżkę." name="okignore" yestext="OK"/>
+		<usetemplate ignoretext="Nie można przenieść plików. Przywrócono poprzednią ścieżkę." name="okignore" />
 	</notification>
 	<notification name="LSLColorCopiedToClipboard">
 		Ciąg koloru w formacie LSL został skopiowany do schowka. Możesz go teraz wkleić w swoim skrypcie i zacząć używać.
@@ -4465,7 +4353,6 @@ Spróbuj zaznaczyć mniejszy obszar ziemi.
 	</notification>
 	<notification name="FSBWTooHigh">
 		Mocno zalecamy nie ustawiać przepustowości powyżej 1500 kbps. Jest mało prawdopodobne, aby takie ustawienie nie sprawiało problemów i prawie na pewno nie spowoduje wzrostu wydajności.
-		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="ExodusFlickrVerificationExplanation">
 		Aby móc ładować zdjęcia na Flickr musisz autoryzować dostęp do konta dla [APP_NAME]. Jeśli kontynuujesz, to Twoja przeglądarka internetowa otworzy stronę Flickr, gdzie zostaniesz poproszony/a, aby autoryzować [APP_NAME]. Dostaniesz kod, który będzie trzeba wkleić w odpowiednie pole [APP_NAME].
@@ -4549,7 +4436,7 @@ Poprzedni symulator: [OLDVERSION]
 Kontynuowanie spowoduje, że kontrolki Szybkiego Strojenia zostaną przywrócone do domyślnego ustawienia.
 
 Nie można tego cofnąć.
-		<usetemplate ignoretext="Przywrócenie domyślnych kontrolek Szybkiego Strojenia" name="okcancelignore" notext="Anuluj" yestext="OK"/>
+		<usetemplate ignoretext="Przywrócenie domyślnych kontrolek Szybkiego Strojenia" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="ExportFinished">
 		Wyeksportowano i zapisano do [FILENAME].
@@ -4593,15 +4480,15 @@ Nie można tego cofnąć.
 	</notification>
 	<notification name="RemoveContactSet">
 		Na pewno chcesz usunąć [SET_NAME]? Nie będziesz mieć możliwości go przywrócić.
-		<usetemplate ignoretext="Potwierdź przed usunięciem Zestawu Kontaktów" name="okcancelignore" notext="Anuluj" yestext="Ok"/>
+		<usetemplate ignoretext="Potwierdź przed usunięciem Zestawu Kontaktów" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="RemoveContactFromSet">
 		Na pewno chcesz usunąć [TARGET] z [SET_NAME]?
-		<usetemplate ignoretext="Potwierdź przed usunięciem kogoś z Zestawu Kontaktów" name="okcancelignore" notext="Anuluj" yestext="Ok"/>
+		<usetemplate ignoretext="Potwierdź przed usunięciem kogoś z Zestawu Kontaktów" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="RemoveContactsFromSet">
 		Na pewno chcesz usunąć [TARGET] osób z [SET_NAME]?
-		<usetemplate ignoretext="Potwierdź przed usunięciem większej ilości awatarów z Zestawu Kontaktów" name="okcancelignore" notext="Anuluj" yestext="Ok"/>
+		<usetemplate ignoretext="Potwierdź przed usunięciem większej ilości awatarów z Zestawu Kontaktów" name="okcancelignore" notext="Anuluj" />
 	</notification>
 	<notification name="AddToContactSetSingleSuccess">
 		[NAME] został/a dodany/a do [SET].
@@ -4638,7 +4525,6 @@ Nie można tego cofnąć.
 	<notification name="ConfirmRemoveCredential">
 		Na pewno chcesz usunąć dane logowania dla &lt;nolink&gt;[NAME]&lt;/nolink&gt;?
 		<form name="form">
-			<button name="OK" text="OK"/>
 			<button name="Cancel" text="Anuluj"/>
 		</form>
 	</notification>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 2fd1e1bf0d..cbc9001356 100755
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -323,7 +323,7 @@ Spróbuj zalogować się ponownie za minutę.
 		Region jest niedostępny.
 	</string>
 	<string name="TestingDisconnect">
-		Nastąpiło rozłączenie testowania klienta
+		Testowanie rozłączenia klienta
 	</string>
 	<string name="SocialFacebookConnecting">
 		Łączenie z Facebookiem...
@@ -388,7 +388,7 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="TooltipMustSingleDrop">
 		Tylko pojedynczy obiekt może być tutaj przeciągnięty
 	</string>
-	<string name="TooltipPrice" value="[AMOUNT]L$:"/>
+	<string name="TooltipPrice" value="[AMOUNT]L$: "/>
 	<string name="TooltipFlagScript">
 		Skrypt
 	</string>
@@ -522,9 +522,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="SLappAgentUnmute">
 		Odblokuj
 	</string>
-	<string name="SLappAgentIM">
-		IM
-	</string>
 	<string name="SLappAgentPay">
 		Zapłać
 	</string>
@@ -696,9 +693,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="favorite">
 		ulubione
 	</string>
-	<string name="symbolic link">
-		link
-	</string>
 	<string name="symbolic folder link">
 		link folderu
 	</string>
@@ -951,9 +945,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="minimap_no_focus">
 		Kamera nie może skupić się na użytkowniku, ponieważ jest poza polem widzenia.
 	</string>
-	<string name="Ok">
-		OK
-	</string>
 	<string name="Premature end of file">
 		Przedwczesny koniec pliku
 	</string>
@@ -1080,9 +1071,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="Estate / Homestead">
 		Majątek / Homestead
 	</string>
-	<string name="Mainland / Homestead">
-		Mainland / Homestead
-	</string>
 	<string name="Mainland / Full Region">
 		Mainland / Pełny Region
 	</string>
@@ -1191,9 +1179,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="skirt">
 		Spódnica
 	</string>
-	<string name="alpha">
-		Alpha
-	</string>
 	<string name="tattoo">
 		Tatuaż
 	</string>
@@ -1234,7 +1219,7 @@ Spróbuj zalogować się ponownie za minutę.
 		Spódnica nie jest założona
 	</string>
 	<string name="alpha_not_worn">
-		Alpha nie jest założone
+		Alpha nie jest założona
 	</string>
 	<string name="tattoo_not_worn">
 		Tatuaż nie jest założony
@@ -1302,9 +1287,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="next">
 		Dalej
 	</string>
-	<string name="ok">
-		OK
-	</string>
 	<string name="GroupNotifyGroupNotice">
 		Ogłoszenie grupowe
 	</string>
@@ -1447,7 +1429,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="no_modify" value=" (bez modyfikowania)"/>
 	<string name="no_copy" value=" (bez kopiowania)"/>
 	<string name="worn" value=" (założone)"/>
-	<string name="link" value=" (link)"/>
 	<string name="broken_link" value=" (zepsuty_link)"/>
 	<string name="LoadingContents">
 		Ładowanie zawartości...
@@ -1542,6 +1523,9 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="InvFolder Gestures">
 		Gesty
 	</string>
+	<string name="InvFolder Favorite">
+		Ulubione
+	</string>
 	<string name="InvFolder Favorites">
 		Ulubione
 	</string>
@@ -1593,9 +1577,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="Stone">
 		Kamień
 	</string>
-	<string name="Metal">
-		Metal
-	</string>
 	<string name="Glass">
 		Szkło
 	</string>
@@ -1614,12 +1595,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="Light">
 		Jasny
 	</string>
-	<string name="KBShift">
-		Shift
-	</string>
-	<string name="KBCtrl">
-		Ctrl
-	</string>
 	<string name="Chest">
 		Klatka piersiowa
 	</string>
@@ -1934,9 +1909,6 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="IMParentEstate">
 		majątek rodziców
 	</string>
-	<string name="IMMainland">
-		mainland
-	</string>
 	<string name="IMTeen">
 		dla niepełnoletnich
 	</string>
@@ -2331,45 +2303,12 @@ Oczekiwane .wav, .tga, .bmp, .jpg, .jpeg, lub .bvh
 	<string name="EditLandmarkNavBarMenu">
 		Edytuj Landmarka...
 	</string>
-	<string name="accel-mac-control">
-		&#8963;
-	</string>
-	<string name="accel-mac-command">
-		&#8984;
-	</string>
-	<string name="accel-mac-option">
-		&#8997;
-	</string>
-	<string name="accel-mac-shift">
-		&#8679;
-	</string>
-	<string name="accel-win-control">
-		Ctrl+
-	</string>
-	<string name="accel-win-alt">
-		Alt+
-	</string>
-	<string name="accel-win-shift">
-		Shift+
-	</string>
 	<string name="FileSaved">
 		Plik zapisany
 	</string>
 	<string name="Receiving">
 		Odbieranie
 	</string>
-	<string name="AM">
-		AM
-	</string>
-	<string name="PM">
-		PM
-	</string>
-	<string name="PST">
-		PST
-	</string>
-	<string name="PDT">
-		PDT
-	</string>
 	<string name="Direction_Forward">
 		Do przodu
 	</string>
@@ -2436,9 +2375,6 @@ Oczekiwane .wav, .tga, .bmp, .jpg, .jpeg, lub .bvh
 	<string name="Linden Location">
 		Lokalizacja Lindenów
 	</string>
-	<string name="Adult">
-		Adult
-	</string>
 	<!-- FS:Ansariel: Fixed to match PARCEL_CATEGORY_UI_STRING array -->
 	<string name="Arts and Culture">
 		Sztuka i Kultura
@@ -2674,7 +2610,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 		Detale ciała
 	</string>
 	<string name="Body Fat">
-		Zawartość tkanki tłuszczowej
+		Puszystość
 	</string>
 	<string name="Body Freckles">
 		Piegi
@@ -2850,9 +2786,6 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 	<string name="more bustle">
 		Bardziej unoś
 	</string>
-	<string name="Chaplin">
-		Chaplin
-	</string>
 	<string name="Cheek Bones">
 		Kości policzkowe
 	</string>
@@ -4054,7 +3987,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 		Region Moderate
 	</string>
 	<string name="LocationCtrlGeneralIconTooltip">
-		Region ogólny
+		Region General
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
 		Awatary wewnątrz tej działki nie mogą być widziane lub słyszane przez awatary, które są poza nią
@@ -4556,7 +4489,7 @@ Jeśli problemy będą występowały nadal, proszę sprawdź sieć i ustawienia
 		Sty:Lut:Mar:Kwi:Maj:Cze:Lip:Sie:Wrz:Paź:Lis:Gru
 	</string>
 	<string name="LocalEstimateUSD">
-		US$ [AMOUNT]
+		[AMOUNT] US$
 	</string>
 	<string name="free">
 		darmowe
@@ -4734,9 +4667,6 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="Command_Snapshot_Label">
 		Zdjęcie
 	</string>
-	<string name="Command_Social_Label">
-		Facebook
-	</string>
 	<string name="Command_Speak_Label">
 		Głos
 	</string>
@@ -5181,6 +5111,9 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
 	<string name="TeleportMaturityExceeded">
 		Rezydent nie może odwiedzić tego regionu.
 	</string>
+	<string name="UserDictionary">
+		[Użytkownika]
+	</string>
 	<string name="logging_calls_disabled_log_empty">
 		Rozmowy nie są zapisywane do dziennika. Jeśli chcesz zacząć je logować wybierz "Zapisywanie: tylko dziennik" lub "Zapisywanie: dziennik i logi rozmów" w Preferencje > Prywatność.
 	</string>

From dcc7f5f7cd442b1d9ca55935ff0b3098f73dfb67 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Mon, 17 Nov 2014 21:42:37 +0100
Subject: [PATCH 118/229] FIRE-14973: Alteration of commit 3feb18ac2ac0, by
 Greatfox Snowpaw; Split the keyboard shortcut toggle in prefs>chat>General
 for turning off whisper, shout, and OOC setting apart into three separate
 checkboxes to allow individual toggle

---
 indra/newview/app_settings/settings.xml       | 26 +++++++++-
 indra/newview/fsfloaternearbychat.cpp         |  8 +--
 indra/newview/fsnearbychatcontrol.cpp         | 49 +++++++++----------
 .../default/xui/en/panel_preferences_chat.xml | 46 ++++++++++++++---
 .../default/xui/pl/panel_preferences_chat.xml |  7 ++-
 5 files changed, 95 insertions(+), 41 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0d254804fb..1b0ebb9c59 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -22811,10 +22811,32 @@ Change of this parameter will affect the layout of buttons in notification toast
         <key>Value</key>
         <integer>0</integer>
     </map>
-    <key>FSUseCtrlAltShiftForChatTypes</key>
+    <key>FSUseCtrlShout</key>
     <map>
       <key>Comment</key>
-      <string>Use CTRL, SHIFT and ALT keys to change message type into shout, whisper or OOC</string>
+      <string>Set to TRUE to use the keyboard shortcut Ctrl+Enter to Shout in Nearby Chat.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FSUseShiftWhisper</key>
+    <map>
+      <key>Comment</key>
+      <string>Set to TRUE to use the keyboard shortcut Shift+Enter to Whisper in Nearby Chat.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FSUseAltOOC</key>
+    <map>
+      <key>Comment</key>
+      <string>Set to TRUE to use the keyboard shortcut Alt+Enter to send ((OOC)) messages to Nearby Chat.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index 411a4e6822..5a50bc9714 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -681,23 +681,23 @@ BOOL FSFloaterNearbyChat::handleKeyHere( KEY key, MASK mask )
 {
 	BOOL handled = FALSE;
 	
-	if (KEY_RETURN == key && gSavedSettings.getBOOL("FSUseCtrlAltShiftForChatTypes"))
+	if (KEY_RETURN == key)
 	{
-		if (mask == MASK_CONTROL)
+		if (mask == MASK_CONTROL && gSavedSettings.getBOOL("FSUseCtrlShout"))
 		{
 			// shout
 			mInputEditor->updateHistory();
 			sendChat(CHAT_TYPE_SHOUT);
 			handled = TRUE;
 		}
-		else if (mask == MASK_SHIFT)
+		else if (mask == MASK_SHIFT && gSavedSettings.getBOOL("FSUseShiftWhisper"))
 		{
 			// whisper
 			mInputEditor->updateHistory();
 			sendChat(CHAT_TYPE_WHISPER);
 			handled = TRUE;
 		}
-		else if (mask == MASK_ALT)
+		else if (mask == MASK_ALT && gSavedSettings.getBOOL("FSUseAltOOC"))
 		{
 			// OOC
 			mInputEditor->updateHistory();
diff --git a/indra/newview/fsnearbychatcontrol.cpp b/indra/newview/fsnearbychatcontrol.cpp
index 43f19ec85d..4783ad6abe 100644
--- a/indra/newview/fsnearbychatcontrol.cpp
+++ b/indra/newview/fsnearbychatcontrol.cpp
@@ -357,32 +357,29 @@ BOOL FSNearbyChatControl::handleKeyHere(KEY key, MASK mask )
 	}
 	else if( KEY_RETURN == key )
 	{
-		if (gSavedSettings.getBOOL("FSUseCtrlAltShiftForChatTypes"))
-		{
-			if (mask == MASK_CONTROL)
-			{
-				// shout
-				type = CHAT_TYPE_SHOUT;
-				handled = TRUE;
-			}
-			else if (mask == MASK_SHIFT)
-			{
-				// whisper
-				type = CHAT_TYPE_WHISPER;
-				handled = TRUE;
-			}
-			else if (mask == MASK_ALT)
-			{
-				// OOC
-				type = CHAT_TYPE_OOC;
-				handled = TRUE;
-			}
-			else if (mask == MASK_NONE)
-			{
-				// say
-				type = CHAT_TYPE_NORMAL;
-				handled = TRUE;
-			}
+		if (mask == MASK_CONTROL && gSavedSettings.getBOOL("FSUseCtrlShout"))
+		{
+			// shout
+			type = CHAT_TYPE_SHOUT;
+			handled = TRUE;
+		}
+		else if (mask == MASK_SHIFT && gSavedSettings.getBOOL("FSUseShiftWhisper"))
+		{
+			// whisper
+			type = CHAT_TYPE_WHISPER;
+			handled = TRUE;
+		}
+		else if (mask == MASK_ALT && gSavedSettings.getBOOL("FSUseAltOOC"))
+		{
+			// OOC
+			type = CHAT_TYPE_OOC;
+			handled = TRUE;
+		}
+		else if (mask == MASK_NONE)
+		{
+			// say
+			type = CHAT_TYPE_NORMAL;
+			handled = TRUE;
 		}
 		else
 		{
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index f18be020c2..2478273d78 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -196,14 +196,6 @@
              top_pad="1"
              height="16"
              width="400" />
-            <check_box
-             control_name="FSUseCtrlAltShiftForChatTypes"
-             name="FSUseCtrlAltShiftForChatTypes"
-             label="Use CTRL, SHIFT and ALT keys to change message type into shout, whisper or OOC"
-             layout="topleft"
-             top_pad="1"
-             height="16"
-             width="400" />
             <check_box
              control_name="FSIMSystemMessageBrackets"
              name="FSIMSystemMessageBrackets"
@@ -1937,6 +1929,44 @@
      commit_callback.function="Pref.TranslationSettings"
      label="Translation...">
     </button>
+    <text
+     top="45"
+     left="20"
+     height="14"
+     width="400"
+     name="textUseKeyboardShortcuts"
+     follows="left|top"
+     layout="topleft">
+          Use Keyboard Shortcuts:
+    </text>
+    <check_box
+     control_name="FSUseCtrlShout"
+     name="FSUseCtrlShout"
+     label="Ctrl+Enter (Shout)"
+     layout="topleft"
+     top_pad="5"
+     left_delta="10"
+     height="18"
+     tool_tip="Enable this if you would like to use the keyboard shortcut Ctrl+Enter to Shout in Nearby Chat."
+     width="155" />
+    <check_box
+     control_name="FSUseShiftWhisper"
+     name="FSUseShiftWhisper"
+     label="Shift+Enter (Whisper)"
+     layout="topleft"
+     left_pad="10"
+     height="18"
+     tool_tip="Enable this if you would like to use the keyboard shortcut Shift+Enter to Whisper in Nearby Chat"
+     width="170" />
+    <check_box
+     control_name="FSUseAltOOC"
+     name="FSUseAltOOC"
+     label="Alt+Enter ((OOC))"
+     layout="topleft"
+     left_pad="10"
+     height="18"
+     tool_tip="Enable this if you would like to use the keyboard shortcut Alt+Enter to send ((OOC)) messages to Nearby Chat."
+     width="110" />
   </panel>
 </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index 31427e67be..691f183742 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -26,7 +26,6 @@
 			<check_box label="Powiadomienia o pisaniu do innych awatarów podczas sesji IM" name="FSSendTypingState"/>
 			<check_box label="Włącz autouzupełnianie gestów w pasku czatu lokalnego" name="FSChatbarGestureAutoCompleteEnable"/>
 			<check_box label="Włącz automatyczne odgadywanie imion w pasku czatu lokalnego" name="FSChatbarNamePrediction"/>
-			<check_box name="FSUseCtrlAltShiftForChatTypes" label="Używaj klawiszy CTRL, SHIFT i ALT, aby zmieniać typ wiadomości na krzyk, szept lub OOC"/>
 			<check_box name="FSIMSystemMessageBrackets" label="Pokazuj systemowe wiadomości czatu w nawiasach"/>
 			<check_box name="FSChatHistoryShowYou" label="Pokazuj &quot;Ty&quot; w logu czatu zamiast swojego imienia" />
 			<check_box name="IMShowNamesForP2PConv" label="Pokazuj imiona w bezpośrednich wiadomościach IM" />
@@ -265,6 +264,12 @@
 			<button name="autoreplace_showgui" label="Autokorekta"/>
 			<button name="spellcheck_showgui" label="Sprawdzanie pisowni"/>
 			<button label="Tłumaczenie..." name="translation_settings_btn"/>
+			<text name="textUseKeyboardShortcuts">
+				Używaj skrótów klawiszowych:
+			</text>
+			<check_box name="FSUseCtrlShout" label="Ctrl+Enter (krzyk)" tool_tip="Zaznacz tą opcję, jeśli chcesz używać skrótu klawiszowego Ctrl+Enter, aby krzyczeć poprzez czat lokalny." />
+			<check_box name="FSUseShiftWhisper" label="Shift+Enter (szept)" tool_tip="Zaznacz tą opcję, jeśli chcesz używać skrótu klawiszowego Shift+Enter, aby szeptać poprzez czat lokalny" />
+			<check_box name="FSUseAltOOC" tool_tip="Zaznacz tą opcję, jeśli chcesz używać skrótu klawiszowego Alt+Enter, aby wysyłać wiadomości ((OOC)) poprzez czat lokalny." />
 		</panel>
 	</tab_container>
 </panel>

From bf300d7633122136db18e1e7a20ad36304cbd7c8 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 17 Nov 2014 22:52:32 +0100
Subject: [PATCH 119/229] Updated German translation

---
 .../skins/default/xui/de/panel_preferences_chat.xml        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 742e0b569c..90dc3e1ceb 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -27,7 +27,6 @@
 			<check_box label="Andere Avatare während IM-Sitzungen benachrichtigen, wenn ich schreibe" name="FSSendTypingState"/>
 			<check_box label="Auto-Vervollständigen für Gesten im Chat in der Nähe aktivieren" name="FSChatbarGestureAutoCompleteEnable"/>
 			<check_box label="Automatische Namensvorhersage in „Chat in der Nähe“-Eingabezeile aktivieren" name="FSChatbarNamePrediction"/>
-			<check_box label="STRG, UMSCHALT und ALT zum Rufen, Flüstern oder OOC verwenden" name="FSUseCtrlAltShiftForChatTypes"/>
 			<check_box label="Systemmeldungen in Klammern einschließen" name="FSIMSystemMessageBrackets"/>
 			<check_box label="Im Chatverlauf „Du“ anstatt des eigenen Namens anzeigen" name="FSChatHistoryShowYou"/>
 			<check_box label="Namen in direkten IMs anzeigen" name="IMShowNamesForP2PConv"/>
@@ -286,6 +285,12 @@
 			<button name="autoreplace_showgui" label="Automatische Ersetzung..."/>
 			<button name="spellcheck_showgui" label="Rechtschreibprüfung..." width="145"/>
 			<button label="Einstellungen Chat-Übersetzung" name="translation_settings_btn" width="190"/>
+			<text name="textUseKeyboardShortcuts">
+				Tastatur-Shortcuts verwenden:
+			</text>
+			<check_box label="Strg + Return (Rufen)" tool_tip="Aktivieren, falls der Tastatur-Shortcut Strg + Return zum Rufen im Chat in der Nähe verwendet werden soll." name="FSUseCtrlShout"/>
+			<check_box label="Umschalt + Return (Flüstern)" tool_tip="Aktivieren, falls der Tastatur-Shortcut Umschalt + Return zum Flüstern im Chat in der Nähe verwendet werden soll." name="FSUseShiftWhisper"/>
+			<check_box label="Alt + Return (OOC)" tool_tip="Aktivieren, falls der Tastatur-Shortcut Alt + Return für OOC-Chat im Chat in der Nähe verwendet werden soll." name="FSUseAltOOC"/>
 		</panel>
 
 	</tab_container>

From eb6adbd81818d1fa5d23ae7309c8ba32528fbc25 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 18 Nov 2014 10:32:26 +0100
Subject: [PATCH 120/229] FIRE-10861: Fix Windlight settings sorting

---
 ...xml => %28SS%29%20Atmos%2023%2E30%202.xml} |  0
 ...=> Phototools%2D%20Black%20Default%20.xml} |  0
 ...ols%2D%20Breakwave%20Building%20Water.xml} |  0
 ....xml => Phototools%2D%20Chandra%20Sea.xml} |  0
 ... Phototools%2D%20Gallery%20Water%2001.xml} |  0
 ...t.xml => Phototools%2D%20Ship%20Light.xml} |  0
 indra/newview/llwaterparammanager.cpp         | 32 +++++++++++++++++--
 indra/newview/llwaterparammanager.h           |  4 +++
 indra/newview/llwlparammanager.cpp            |  6 ++++
 9 files changed, 39 insertions(+), 3 deletions(-)
 rename indra/newview/app_settings/windlight/skies/{%28SS%29%20Atmos%2023.30%202.xml => %28SS%29%20Atmos%2023%2E30%202.xml} (100%)
 rename indra/newview/app_settings/windlight/water/{Phototools-%20Black%20Default%20.xml => Phototools%2D%20Black%20Default%20.xml} (100%)
 rename indra/newview/app_settings/windlight/water/{Phototools-%20Breakwave%20Building%20Water.xml => Phototools%2D%20Breakwave%20Building%20Water.xml} (100%)
 rename indra/newview/app_settings/windlight/water/{Phototools-%20Chandra%20Sea.xml => Phototools%2D%20Chandra%20Sea.xml} (100%)
 rename indra/newview/app_settings/windlight/water/{Phototools-%20Gallery%20Water%2001.xml => Phototools%2D%20Gallery%20Water%2001.xml} (100%)
 rename indra/newview/app_settings/windlight/water/{Phototools-%20Ship%20Light.xml => Phototools%2D%20Ship%20Light.xml} (100%)

diff --git a/indra/newview/app_settings/windlight/skies/%28SS%29%20Atmos%2023.30%202.xml b/indra/newview/app_settings/windlight/skies/%28SS%29%20Atmos%2023%2E30%202.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/%28SS%29%20Atmos%2023.30%202.xml
rename to indra/newview/app_settings/windlight/skies/%28SS%29%20Atmos%2023%2E30%202.xml
diff --git a/indra/newview/app_settings/windlight/water/Phototools-%20Black%20Default%20.xml b/indra/newview/app_settings/windlight/water/Phototools%2D%20Black%20Default%20.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/water/Phototools-%20Black%20Default%20.xml
rename to indra/newview/app_settings/windlight/water/Phototools%2D%20Black%20Default%20.xml
diff --git a/indra/newview/app_settings/windlight/water/Phototools-%20Breakwave%20Building%20Water.xml b/indra/newview/app_settings/windlight/water/Phototools%2D%20Breakwave%20Building%20Water.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/water/Phototools-%20Breakwave%20Building%20Water.xml
rename to indra/newview/app_settings/windlight/water/Phototools%2D%20Breakwave%20Building%20Water.xml
diff --git a/indra/newview/app_settings/windlight/water/Phototools-%20Chandra%20Sea.xml b/indra/newview/app_settings/windlight/water/Phototools%2D%20Chandra%20Sea.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/water/Phototools-%20Chandra%20Sea.xml
rename to indra/newview/app_settings/windlight/water/Phototools%2D%20Chandra%20Sea.xml
diff --git a/indra/newview/app_settings/windlight/water/Phototools-%20Gallery%20Water%2001.xml b/indra/newview/app_settings/windlight/water/Phototools%2D%20Gallery%20Water%2001.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/water/Phototools-%20Gallery%20Water%2001.xml
rename to indra/newview/app_settings/windlight/water/Phototools%2D%20Gallery%20Water%2001.xml
diff --git a/indra/newview/app_settings/windlight/water/Phototools-%20Ship%20Light.xml b/indra/newview/app_settings/windlight/water/Phototools%2D%20Ship%20Light.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/water/Phototools-%20Ship%20Light.xml
rename to indra/newview/app_settings/windlight/water/Phototools%2D%20Ship%20Light.xml
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index c854e1fc66..313de63e49 100755
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -144,7 +144,10 @@ void LLWaterParamManager::savePreset(const std::string & name)
 
 	// make an empty llsd
 	LLSD paramsData(LLSD::emptyMap());
-	std::string pathName(getUserDir() + LLURI::escape(name) + ".xml");
+	// <FS:Ansariel> FIRE-10861: Fix Windlight settings order
+	//std::string pathName(getUserDir() + LLURI::escape(name) + ".xml");
+	std::string pathName(getUserDir() + escapeString(name) + ".xml");
+	// </FS:Ansariel>
 
 	// fill it with LLSD windlight params
 	paramsData = mParamList[name].getAll();
@@ -348,7 +351,10 @@ bool LLWaterParamManager::removeParamSet(const std::string& name, bool delete_fr
 	// remove from file system if requested
 	if (delete_from_disk)
 	{
-		if (gDirUtilp->deleteFilesInDir(getUserDir(), LLURI::escape(name) + ".xml") < 1)
+		// <FS:Ansariel> FIRE-10861: Fix Windlight settings order
+		//if (gDirUtilp->deleteFilesInDir(getUserDir(), LLURI::escape(name) + ".xml") < 1)
+		if (gDirUtilp->deleteFilesInDir(getUserDir(), escapeString(name) + ".xml") < 1)
+		// </FS:Ansariel>
 		{
 			LL_WARNS("WindLight") << "Error removing water preset " << name << " from disk" << LL_ENDL;
 		}
@@ -362,7 +368,10 @@ bool LLWaterParamManager::removeParamSet(const std::string& name, bool delete_fr
 bool LLWaterParamManager::isSystemPreset(const std::string& preset_name) const
 {
 	// *TODO: file system access is excessive here.
-	return gDirUtilp->fileExists(getSysDir() + LLURI::escape(preset_name) + ".xml");
+	// <FS:Ansariel> FIRE-10861: Fix Windlight settings order
+	//return gDirUtilp->fileExists(getSysDir() + LLURI::escape(preset_name) + ".xml");
+	return gDirUtilp->fileExists(getSysDir() + escapeString(preset_name) + ".xml");
+	// </FS:Ansariel>
 }
 
 void LLWaterParamManager::getPresetNames(preset_name_list_t& presets) const
@@ -441,3 +450,20 @@ std::string LLWaterParamManager::getUserDir()
 {
 	return gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS , "windlight/water", "");
 }
+
+// <FS:Ansariel> FIRE-10861: Fix Windlight settings order
+// static
+std::string LLWaterParamManager::escapeString(const std::string& str)
+{
+	// Don't use LLURI::escape() because it doesn't encode '-' characters
+	// which may break handling of some system presets like "A-12AM".
+	char* curl_str = curl_escape(str.c_str(), str.size());
+	std::string escaped_str(curl_str);
+	curl_free(curl_str);
+
+	LLStringUtil::replaceString(escaped_str, "-", "%2D");
+	LLStringUtil::replaceString(escaped_str, ".", "%2E");
+
+	return escaped_str;
+}
+// </FS:Ansariel>
diff --git a/indra/newview/llwaterparammanager.h b/indra/newview/llwaterparammanager.h
index dc7d41be2a..408987b707 100755
--- a/indra/newview/llwaterparammanager.h
+++ b/indra/newview/llwaterparammanager.h
@@ -293,6 +293,10 @@ public:
 	F32 getFogDensity(void);
 	LLColor4 getFogColor(void);
 
+	// <FS:Ansariel> FIRE-10861: Fix Windlight settings order
+	/// escape string in a way different from LLURI::escape()
+	static std::string escapeString(const std::string& str);
+
 public:
 
 	LLWaterParamSet mCurParams;
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp
index a9a64933b1..b4312f8b4e 100755
--- a/indra/newview/llwlparammanager.cpp
+++ b/indra/newview/llwlparammanager.cpp
@@ -774,5 +774,11 @@ std::string LLWLParamManager::escapeString(const std::string& str)
 	std::string escaped_str(curl_str);
 	curl_free(curl_str);
 
+	// <FS:Ansariel> FIRE-10861: Fix Windlight settings order
+	// And neither does cURL...
+	LLStringUtil::replaceString(escaped_str, "-", "%2D");
+	LLStringUtil::replaceString(escaped_str, ".", "%2E");
+	// </FS:Ansariel>
+
 	return escaped_str;
 }

From b7f03802acabd4e83c8f239f268c49435e801741 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 18 Nov 2014 11:38:12 +0100
Subject: [PATCH 121/229] FIRE-14987 / BUG-7784 / MAINT-4677: Cannot mute
 objects with slashes in their name via V1 chat history

---
 indra/llui/llurlaction.cpp       | 5 ++++-
 indra/newview/llpanelprofile.cpp | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/indra/llui/llurlaction.cpp b/indra/llui/llurlaction.cpp
index 1b08067cbf..85a700d736 100755
--- a/indra/llui/llurlaction.cpp
+++ b/indra/llui/llurlaction.cpp
@@ -227,7 +227,10 @@ void LLUrlAction::blockObject(std::string url)
 	std::string object_name = getObjectName(url);
 	if (LLUUID::validate(object_id))
 	{
-		executeSLURL("secondlife:///app/agent/" + object_id + "/block/" + object_name);
+		// <FS:Ansariel> FIRE-14987: Cannot mute objects with slashes in their name via V1 chat history
+		//executeSLURL("secondlife:///app/agent/" + object_id + "/block/" + object_name);
+		executeSLURL("secondlife:///app/agent/" + object_id + "/block/" + LLURI::escape(object_name));
+		// </FS:Ansariel>
 	}
 }
 
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 0420706f66..449989d8d3 100755
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -200,7 +200,10 @@ public:
 		{
 			if (params.size() > 2)
 			{
-				const std::string object_name = params[2].asString();
+				// <FS:Ansariel> FIRE-14987: Cannot mute objects with slashes in their name via V1 chat history
+				//const std::string object_name = params[2].asString();
+				const std::string object_name = LLURI::unescape(params[2].asString());
+				// </FS:Ansariel>
 				LLMute mute(avatar_id, object_name, LLMute::OBJECT);
 				LLMuteList::getInstance()->add(mute);
 				LLPanelBlockedList::showPanelAndSelect(mute.mID);

From 0cbfb124ac3a37e9cdc89f28d18518e01f7faef3 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 18 Nov 2014 16:04:12 +0100
Subject: [PATCH 122/229] FIRE-14988: Avatar coordinates are shown in statusbar
 when RLVa showloc restriction is set

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

diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp
index 91420f6b7e..e1955e6fe8 100755
--- a/indra/newview/llagentui.cpp
+++ b/indra/newview/llagentui.cpp
@@ -137,7 +137,7 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
 		region_name = RlvStrings::getString(RLV_STRING_HIDDEN_REGION);
 		if (LOCATION_FORMAT_NO_MATURITY == fmt)
 			fmt = LOCATION_FORMAT_LANDMARK;
-		else if (LOCATION_FORMAT_FULL == fmt)
+		else if (LOCATION_FORMAT_FULL == fmt || LOCATION_FORMAT_V1_STATUSBAR == fmt)
 			fmt = LOCATION_FORMAT_NO_COORDS;
 	}
 // [/RLVa:KB]

From 2c8a62a6aa8444a7c767e5c5a10b8bc7b53007ea Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 18 Nov 2014 16:08:01 +0100
Subject: [PATCH 123/229] Hide "Notes" indicator in radar if RLVa shownames
 restriction is set

---
 indra/newview/fsradar.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp
index e5c63679ec..3a0f7c2075 100644
--- a/indra/newview/fsradar.cpp
+++ b/indra/newview/fsradar.cpp
@@ -509,10 +509,10 @@ void FSRadar::updateRadarList()
 		entry["range"] = (avRange > AVATAR_UNKNOWN_RANGE ? llformat("%3.2f", avRange) : llformat(">%3.2f", drawRadius));
 		entry["typing"] = (avVo && avVo->isTyping());
 		entry["sitting"] = (avVo && (avVo->getParent() || avVo->isMotionActive(ANIM_AGENT_SIT_GROUND) || avVo->isMotionActive(ANIM_AGENT_SIT_GROUND_CONSTRAINED)));
-		entry["has_notes"] = ent->hasNotes();
 
 		if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
 		{
+			entry["has_notes"] = ent->hasNotes();
 			entry["age"] = (avAge > -1 ? llformat("%d", avAge) : "");
 			if (ent->hasAlertAge())
 			{
@@ -531,6 +531,7 @@ void FSRadar::updateRadarList()
 		}
 		else
 		{
+			entry["has_notes"] = false;
 			entry["age"] = "---";
 		}
 

From 026e0ad8df168ab3791990dfac2c1641fb4e8d3b Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 18 Nov 2014 16:21:12 +0100
Subject: [PATCH 124/229] FIRE-14988: Hide coordinates of objects in hovertips
 if RLVa showloc restriction is set

---
 indra/newview/lltoolpie.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 8d638b2c0b..8298570f4d 100755
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1296,9 +1296,13 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
 				if (region)
 				{
 					LLVector3 relPositionObject = region->getPosRegionFromGlobal(hover_object->getPositionGlobal());
-					args.clear();
-					args["POSITION"] = llformat("<%.02f, %.02f, %.02f>", relPositionObject.mV[VX], relPositionObject.mV[VY], relPositionObject.mV[VZ]);
-					tooltip_msg.append("\n" + LLTrans::getString("TooltipPosition", args));
+
+					if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+					{
+						args.clear();
+						args["POSITION"] = llformat("<%.02f, %.02f, %.02f>", relPositionObject.mV[VX], relPositionObject.mV[VY], relPositionObject.mV[VZ]);
+						tooltip_msg.append("\n" + LLTrans::getString("TooltipPosition", args));
+					}
 
 					// Get distance
 					F32 distance = (relPositionObject - region->getPosRegionFromGlobal(gAgent.getPositionGlobal())).magVec();

From ad233db3c14886d81323363ad5eb50e3878d974c Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 18 Nov 2014 18:49:33 +0100
Subject: [PATCH 125/229] Tip to default branch.

---
 README_BUILD_FIRESTORM_LINUX.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README_BUILD_FIRESTORM_LINUX.txt b/README_BUILD_FIRESTORM_LINUX.txt
index 1ddeec850d..1bf208924e 100755
--- a/README_BUILD_FIRESTORM_LINUX.txt
+++ b/README_BUILD_FIRESTORM_LINUX.txt
@@ -47,4 +47,3 @@ Logs:
 Output:
 
         Look for output in build-linux-i686/newview/Release
-

From 0e805534a487a1ed7b436df1d79d3ae55d73ec40 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 21 Nov 2014 09:29:50 +0100
Subject: [PATCH 126/229] FIRE-14995: [RLVa] Crashfix: Escape potentially dirty
 strings before using them as regex in replace_all_regex; fix released under
 LGPL by Lirusaito Faers (Singularity viewer)

---
 indra/newview/rlvcommon.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index 3fa5ad31cd..18d4df4aff 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -357,6 +357,12 @@ void RlvStrings::setCustomString(const std::string& strStringName, const std::st
 
 bool RlvUtil::m_fForceTp = false;
 
+std::string escape_for_regex(const std::string& str)
+{
+	using namespace boost;
+	return regex_replace(str, regex("[.^$|()\\[\\]{}*+?\\\\]"), "\\\\&", match_default|format_sed);
+}
+
 // Checked: 2009-07-04 (RLVa-1.0.0a) | Modified: RLVa-1.0.0a
 void RlvUtil::filterLocation(std::string& strUTF8Text)
 {
@@ -364,12 +370,12 @@ void RlvUtil::filterLocation(std::string& strUTF8Text)
 	LLWorld::region_list_t regions = LLWorld::getInstance()->getRegionList();
 	const std::string& strHiddenRegion = RlvStrings::getString(RLV_STRING_HIDDEN_REGION);
 	for (LLWorld::region_list_t::const_iterator itRegion = regions.begin(); itRegion != regions.end(); ++itRegion)
-		boost::replace_all_regex(strUTF8Text, boost::regex("\\b" + (*itRegion)->getName() + "\\b", boost::regex::icase), strHiddenRegion);
+		boost::replace_all_regex(strUTF8Text, boost::regex("\\b" + escape_for_regex((*itRegion)->getName()) + "\\b", boost::regex::icase), strHiddenRegion);
 
 	// Filter any mention of the parcel name
 	LLViewerParcelMgr* pParcelMgr = LLViewerParcelMgr::getInstance();
 	if (pParcelMgr)
-		boost::replace_all_regex(strUTF8Text, boost::regex("\\b" + pParcelMgr->getAgentParcelName() + "\\b", boost::regex::icase), RlvStrings::getString(RLV_STRING_HIDDEN_PARCEL));
+		boost::replace_all_regex(strUTF8Text, boost::regex("\\b" + escape_for_regex(pParcelMgr->getAgentParcelName()) + "\\b", boost::regex::icase), RlvStrings::getString(RLV_STRING_HIDDEN_PARCEL));
 }
 
 // Checked: 2010-12-08 (RLVa-1.2.2c) | Modified: RLVa-1.2.2c
@@ -382,7 +388,7 @@ void RlvUtil::filterNames(std::string& strUTF8Text, bool fFilterLegacy)
 		LLAvatarName avName;
 		if (LLAvatarNameCache::get(idAgents[idxAgent], &avName))
 		{
-			const std::string& strDisplayName = avName.getDisplayName();
+			const std::string& strDisplayName = escape_for_regex(avName.getDisplayName());
 			bool fFilterDisplay = (strDisplayName.length() > 2);
 			const std::string& strLegacyName = avName.getLegacyName();
 			fFilterLegacy &= (strLegacyName.length() > 2);

From 7b2c3ec69d13791457aa89146aeb83a95a15eaba Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 21 Nov 2014 10:49:19 +0100
Subject: [PATCH 127/229] FIRE-10861: Remove duplicate and wrongly encoded
 windlights

---
 .../windlight/skies/%252ACanimod.xml          | 141 ------------------
 .../%252AStarley%252A%20Settings%202.xml      | 141 ------------------
 ...20smoky%20blue%20sky%20%253A%20reverse.xml | 141 ------------------
 ...IDDAY%20%2D%20Why%20so%20blue%253F%201.xml | 141 ------------------
 ...IDDAY%20%2D%20Why%20so%20blue%253F%202.xml | 141 ------------------
 .../skies/AnaLu%20%252Astudio%252A%205.xml    | 141 ------------------
 6 files changed, 846 deletions(-)
 delete mode 100755 indra/newview/app_settings/windlight/skies/%252ACanimod.xml
 delete mode 100755 indra/newview/app_settings/windlight/skies/%252AStarley%252A%20Settings%202.xml
 delete mode 100755 indra/newview/app_settings/windlight/skies/%5BEUPHORIA%5D%20smoky%20blue%20sky%20%253A%20reverse.xml
 delete mode 100755 indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%201.xml
 delete mode 100755 indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%202.xml
 delete mode 100755 indra/newview/app_settings/windlight/skies/AnaLu%20%252Astudio%252A%205.xml

diff --git a/indra/newview/app_settings/windlight/skies/%252ACanimod.xml b/indra/newview/app_settings/windlight/skies/%252ACanimod.xml
deleted file mode 100755
index d4e69e6226..0000000000
--- a/indra/newview/app_settings/windlight/skies/%252ACanimod.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>1.4699999094009399</real>
-            <real>1.4699999094009399</real>
-            <real>1.4699999094009399</real>
-            <real>0.48999997973442078</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.099999994039535522</real>
-            <real>0.037499997764825821</real>
-            <real>0.067499987781047821</real>
-            <real>0.049999997019767761</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.15130999684333801</real>
-            <real>0.30000001192092896</real>
-            <real>0.35131001472473145</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.22999998927116394</real>
-            <real>0.22999998927116394</real>
-            <real>0.22999998927116394</real>
-            <real>0.22999998927116394</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.88419097661972046</real>
-            <real>0.53047597408294678</real>
-            <real>0.52999997138977051</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.2800000011920929</real>
-            <real>0.19999998807907104</real>
-            <real>0.31999999284744263</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.0099999997764825821</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>0</real>
-            <real>15.329999446868896</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00022000000171829015</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>16.200000762939453</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>6.2831854820251465</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.4199999570846558</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>18.599998474121094</real>
-            <real>0.0012815999798476696</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>1</real>
-            <real>0.21744099259376526</real>
-            <real>0.21744099259376526</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>-1.7484555314695172e-007</real>
-            <real>0</real>
-            <real>1</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>403</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>2</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>0</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0</real>
-            <real>0</real>
-            <real>0</real>
-            <real>0</real>
-        </array>
-    </map>
-</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%252AStarley%252A%20Settings%202.xml b/indra/newview/app_settings/windlight/skies/%252AStarley%252A%20Settings%202.xml
deleted file mode 100755
index 6d1c09d30a..0000000000
--- a/indra/newview/app_settings/windlight/skies/%252AStarley%252A%20Settings%202.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>1.4699999094009399</real>
-            <real>1.4699999094009399</real>
-            <real>1.4699999094009399</real>
-            <real>0.48999997973442078</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.14000000059604645</real>
-            <real>0.14000000059604645</real>
-            <real>0.14000000059604645</real>
-            <real>0.070000000298023224</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.83809572458267212</real>
-            <real>1.0735483169555664</real>
-            <real>1.2799999713897705</real>
-            <real>0.63999998569488525</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.12862999737262726</real>
-            <real>0.12862999737262726</real>
-            <real>0.12862999737262726</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.70999997854232788</real>
-            <real>0.53047597408294678</real>
-            <real>0.4270470142364502</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.38419300317764282</real>
-            <real>0.5</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.72999995946884155</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10</real>
-            <real>10</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.2199999988079071</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00017999998817685992</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>11.40000057220459</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.6899999380111694</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>6.4079799652099609</real>
-            <real>0.0012815999798476696</real>
-            <real>-0.39999997615814209</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>1.4900000095367432</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0</real>
-            <real>0.21744099259376526</real>
-            <real>0.21744099259376526</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>805</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>2</integer>
-    <key>star_brightness</key>
-        <real>1.5699999332427979</real>
-    <key>sun_angle</key>
-        <real>0</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>3</real>
-            <real>3</real>
-            <real>3</real>
-            <real>1</real>
-        </array>
-    </map>
-</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BEUPHORIA%5D%20smoky%20blue%20sky%20%253A%20reverse.xml b/indra/newview/app_settings/windlight/skies/%5BEUPHORIA%5D%20smoky%20blue%20sky%20%253A%20reverse.xml
deleted file mode 100755
index 4d50f80912..0000000000
--- a/indra/newview/app_settings/windlight/skies/%5BEUPHORIA%5D%20smoky%20blue%20sky%20%253A%20reverse.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>1.8300000429153442</real>
-            <real>1.8300000429153442</real>
-            <real>1.8300000429153442</real>
-            <real>0.61000001430511475</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.21899415552616119</real>
-            <real>0.40148928761482239</real>
-            <real>0.68000000715255737</real>
-            <real>0.34000000357627869</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0</real>
-            <real>0.10838708281517029</real>
-            <real>0.14000000059604645</real>
-            <real>0.070000000298023224</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0</real>
-            <real>0</real>
-            <real>0</real>
-            <real>0</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.14000000059604645</real>
-            <real>0.62000000476837158</real>
-            <real>0.99999999999999767</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.48999997973442078</real>
-            <real>0.19999998807907104</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.43999999761581421</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.199999853917745</real>
-            <real>10.010999722693327</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.29999998211860657</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00015999999595806003</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>10.800000190734863</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>0.94999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>4.9999999403953552</real>
-            <real>0.0010000000616982377</real>
-            <real>-0.47999998693999579</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.94999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.25999999046325684</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.96692299842834473</real>
-            <real>-0.25506836175918579</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>1128</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>28</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>1.8287147283554077</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.65999996662139893</real>
-            <real>0.78157895803451538</real>
-            <real>0.89999997615814209</real>
-            <real>0.29999998211860657</real>
-        </array>
-    </map>
-</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%201.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%201.xml
deleted file mode 100755
index e2d59e6bee..0000000000
--- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%201.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>1.0799999237060547</real>
-            <real>1.0799999237060547</real>
-            <real>1.0799999237060547</real>
-            <real>0.35999998450279236</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.11593805998563766</real>
-            <real>0.21255312860012054</real>
-            <real>0.74000000953674316</real>
-            <real>0.74000000953674316</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.52645158767700195</real>
-            <real>0.52645158767700195</real>
-            <real>0.8399999737739563</real>
-            <real>0.8399999737739563</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.68000000715255737</real>
-            <real>0.32800003886222839</real>
-            <real>0.32800003886222839</real>
-            <real>0.68000000715255737</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.90999996662139893</real>
-            <real>0.45999997854232788</real>
-            <real>0.40999999642372131</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.63999998569488525</real>
-            <real>0.38999998569488525</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.36999997496604919</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.050000190734863</real>
-            <real>9.9200000762939453</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.19999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00011999999696854502</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>0.93999999761581421</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>6.1999988555908203</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.55000001192092896</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.34999999403953552</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.19999998807907104</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.77450281381607056</real>
-            <real>-0.63257044553756714</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>913</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>22</integer>
-    <key>star_brightness</key>
-        <real>0.039999999105930328</real>
-    <key>sun_angle</key>
-        <real>2.2556638717651367</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>1.2899999618530273</real>
-            <real>0.88457131385803223</real>
-            <real>0.51599997282028198</real>
-            <real>0.42999997735023499</real>
-        </array>
-    </map>
-</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%202.xml b/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%202.xml
deleted file mode 100755
index 9606495c41..0000000000
--- a/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20MIDDAY%20%2D%20Why%20so%20blue%253F%202.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.29999998211860657</real>
-            <real>0.29999998211860657</real>
-            <real>0.29999998211860657</real>
-            <real>0.099999994039535522</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.07937999814748764</real>
-            <real>0.22679997980594635</real>
-            <real>1.6200000047683716</real>
-            <real>0.81000000238418579</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.16684222221374512</real>
-            <real>0.33368346095085144</real>
-            <real>0.57999998331069946</real>
-            <real>0.28999999165534973</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.56000000238418579</real>
-            <real>0.56000000238418579</real>
-            <real>0.56000000238418579</real>
-            <real>0.56000000238418579</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>2.8148899078369141</real>
-            <real>0.78999996185302734</real>
-            <real>0.59999996423721313</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>5.9584097862243652</real>
-            <real>0.85999995470046997</real>
-            <real>0.059999998658895493</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.32999998331069946</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>11.679999351501465</real>
-            <real>10.359999656677246</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.11999999731779099</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00031000000308267772</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>0.60000002384185791</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.3500000238418579</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>8.8000011444091797</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.74999994039535522</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.029999999329447746</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.32999998331069946</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>1</real>
-            <real>-4.3711388286737929e-008</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>1181</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>24</integer>
-    <key>star_brightness</key>
-        <real>0.11999999731779099</real>
-    <key>sun_angle</key>
-        <real>1.5707963705062866</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>1.3499999046325684</real>
-            <real>1.0799999237060547</real>
-            <real>1.0799999237060547</real>
-            <real>0.44999998807907104</real>
-        </array>
-    </map>
-</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/AnaLu%20%252Astudio%252A%205.xml b/indra/newview/app_settings/windlight/skies/AnaLu%20%252Astudio%252A%205.xml
deleted file mode 100755
index b7c6d047f6..0000000000
--- a/indra/newview/app_settings/windlight/skies/AnaLu%20%252Astudio%252A%205.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>2.0099997520446777</real>
-            <real>1.9199999570846558</real>
-            <real>1.8899999856948853</real>
-            <real>2.0099997520446777</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.63999998569488525</real>
-            <real>1.1799999475479126</real>
-            <real>2</real>
-            <real>2</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.23999999463558197</real>
-            <real>0.23999999463558197</real>
-            <real>0.31999999284744263</real>
-            <real>0.31999999284744263</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.39050509865536398</real>
-            <real>0.39050509865536398</real>
-            <real>0.39050509865536398</real>
-            <real>0.39050509865536398</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998254906856</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.199999735331062</real>
-            <real>10.010999579794088</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.12999999523162842</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00017999998391111764</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>2</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.1499999761581421</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>4.9999998807907104</real>
-            <real>0.0010000000478643939</real>
-            <real>-0.47999998436731417</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.64999997615814209</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.08999999612569809</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>188</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>22</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>0</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>2.5799999237060547</real>
-            <real>2.5799999237060547</real>
-            <real>2.5799999237060547</real>
-            <real>2.5799999237060547</real>
-        </array>
-    </map>
-</llsd>

From ef0eb88847673e8269cbd3875e86d3238596f2d0 Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Fri, 21 Nov 2014 20:37:00 +0100
Subject: [PATCH 128/229] FIRE-14996 - fix for crash while selecting linkset
 with blacklisted or derendered child prim.

---
 indra/newview/llselectmgr.cpp | 40 +++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 7f56abb6ab..7627ee83c5 100755
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -7017,14 +7017,50 @@ S32 LLObjectSelection::getNumNodes()
 
 void LLObjectSelection::addNode(LLSelectNode *nodep)
 {
-	llassert_always(nodep->getObject() && !nodep->getObject()->isDead());
+	// <FS:Zi> Fix for crash while selecting objects with derendered child prims
+	// llassert_always(nodep->getObject() && !nodep->getObject()->isDead());
+	if(!nodep)
+	{
+		LL_WARNS("LLObjectSelection") << "skipping NULL node" << LL_ENDL;
+		return;
+	}
+	else if(!nodep->getObject())
+	{
+		LL_WARNS("LLObjectSelection") << "skipping NULL node object pointer" << LL_ENDL;
+		return;
+	}
+	else if(nodep->getObject()->isDead())
+	{
+		LL_WARNS("LLObjectSelection") << "skipping dead node object" << LL_ENDL;
+		return;
+	}
+	// </FS:Zi>
+
 	mList.push_front(nodep);
 	mSelectNodeMap[nodep->getObject()] = nodep;
 }
 
 void LLObjectSelection::addNodeAtEnd(LLSelectNode *nodep)
 {
-	llassert_always(nodep->getObject() && !nodep->getObject()->isDead());
+	// <FS:Zi> Fix for crash while selecting objects with derendered child prims
+	// llassert_always(nodep->getObject() && !nodep->getObject()->isDead());
+	if(!nodep)
+	{
+		LL_WARNS("LLObjectSelection") << "skipping NULL node" << LL_ENDL;
+		return;
+	}
+	else if(!nodep->getObject())
+	{
+		LL_WARNS("LLObjectSelection") << "skipping NULL node object pointer" << LL_ENDL;
+		return;
+	}
+	else if(nodep->getObject()->isDead())
+	{
+		LL_WARNS("LLObjectSelection") << "skipping dead node object" << LL_ENDL;
+		return;
+	}
+	// </FS:Zi>
+
 	mList.push_back(nodep);
 	mSelectNodeMap[nodep->getObject()] = nodep;
 }

From fe253df3f2774d0d571b75513c672a8ca7b4a8a9 Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Fri, 21 Nov 2014 22:08:16 +0100
Subject: [PATCH 129/229] FIRE-14996 - followup fix, plug memory leak.

---
 indra/newview/llselectmgr.cpp | 63 ++++++++++++++++++++++-------------
 indra/newview/llselectmgr.h   |  5 +++
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 7627ee83c5..d5e28abd60 100755
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -7015,23 +7015,44 @@ S32 LLObjectSelection::getNumNodes()
 	return mList.size();
 }
 
+// <FS:Zi> Fix for crash while selecting objects with derendered child prims
+bool LLObjectSelection::checkNode(LLSelectNode* nodep)
+{
+	if(nodep)
+	{
+		if(nodep->getObject())
+		{
+			if(!nodep->getObject()->isDead())
+			{
+				return true;
+			}
+			else
+			{
+				LL_WARNS("LLObjectSelection") << "skipping dead node object" << LL_ENDL;
+			}
+		}
+		else
+		{
+			LL_WARNS("LLObjectSelection") << "skipping NULL node object pointer" << LL_ENDL;
+		}
+	}
+	else
+	{
+		LL_WARNS("LLObjectSelection") << "skipping NULL node" << LL_ENDL;
+	}
+
+	mFailedNodesList.push_back(nodep);
+	LL_WARNS("AddPointer") << "+++***+++ adding pointer " << (U32) nodep << LL_ENDL;
+	return false;
+}
+	// </FS:Zi>
+
 void LLObjectSelection::addNode(LLSelectNode *nodep)
 {
 	// <FS:Zi> Fix for crash while selecting objects with derendered child prims
 	// llassert_always(nodep->getObject() && !nodep->getObject()->isDead());
-	if(!nodep)
+	if(!checkNode(nodep))
 	{
-		LL_WARNS("LLObjectSelection") << "skipping NULL node" << LL_ENDL;
-		return;
-	}
-	else if(!nodep->getObject())
-	{
-		LL_WARNS("LLObjectSelection") << "skipping NULL node object pointer" << LL_ENDL;
-		return;
-	}
-	else if(nodep->getObject()->isDead())
-	{
-		LL_WARNS("LLObjectSelection") << "skipping dead node object" << LL_ENDL;
 		return;
 	}
 	// </FS:Zi>
@@ -7044,19 +7065,8 @@ void LLObjectSelection::addNodeAtEnd(LLSelectNode *nodep)
 {
 	// <FS:Zi> Fix for crash while selecting objects with derendered child prims
 	// llassert_always(nodep->getObject() && !nodep->getObject()->isDead());
-	if(!nodep)
+	if(!checkNode(nodep))
 	{
-		LL_WARNS("LLObjectSelection") << "skipping NULL node" << LL_ENDL;
-		return;
-	}
-	else if(!nodep->getObject())
-	{
-		LL_WARNS("LLObjectSelection") << "skipping NULL node object pointer" << LL_ENDL;
-		return;
-	}
-	else if(nodep->getObject()->isDead())
-	{
-		LL_WARNS("LLObjectSelection") << "skipping dead node object" << LL_ENDL;
 		return;
 	}
 	// </FS:Zi>
@@ -7088,6 +7098,11 @@ void LLObjectSelection::deleteAllNodes()
 	mList.clear();
 	mSelectNodeMap.clear();
 	mPrimaryObject = NULL;
+
+	// <FS:Zi> Fix for crash while selecting objects with derendered child prims
+	std::for_each(mFailedNodesList.begin(),mFailedNodesList.end(),DeletePointer());
+	mFailedNodesList.clear();
+	// </FS:Zi>
 }
 
 LLSelectNode* LLObjectSelection::findNode(LLViewerObject* objectp)
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index a0dbf100db..417c24dd74 100755
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -380,6 +380,11 @@ private:
 	LLPointer<LLViewerObject> mPrimaryObject;
 	std::map<LLPointer<LLViewerObject>, LLSelectNode*> mSelectNodeMap;
 	ESelectType mSelectType;
+
+	// <FS:Zi> Fix for crash while selecting objects with derendered child prims
+	list_t mFailedNodesList;
+	bool checkNode(LLSelectNode* nodep);
+	// </FS:Zi>
 };
 
 typedef LLSafeHandle<LLObjectSelection> LLObjectSelectionHandle;

From 21aed55dc7260f99a7bd3614258d36930291c649 Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Fri, 21 Nov 2014 22:20:56 +0100
Subject: [PATCH 130/229] FIRE-14996 - followup fix 2, remove debugging marker,
 don't track NULL nodes.

---
 indra/newview/llselectmgr.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index d5e28abd60..2a2d5fae2c 100755
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -7035,14 +7035,13 @@ bool LLObjectSelection::checkNode(LLSelectNode* nodep)
 		{
 			LL_WARNS("LLObjectSelection") << "skipping NULL node object pointer" << LL_ENDL;
 		}
+		mFailedNodesList.push_back(nodep);
 	}
 	else
 	{
 		LL_WARNS("LLObjectSelection") << "skipping NULL node" << LL_ENDL;
 	}
 
-	mFailedNodesList.push_back(nodep);
-	LL_WARNS("AddPointer") << "+++***+++ adding pointer " << (U32) nodep << LL_ENDL;
 	return false;
 }
 	// </FS:Zi>

From 6361388aacdf0e07dbf75af423a988ff94a6e732 Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Fri, 21 Nov 2014 22:48:14 +0100
Subject: [PATCH 131/229] FIRE-14471 - don't crash when quick prefs edtor tries
 to update values without having a control selected.

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

diff --git a/indra/newview/quickprefs.cpp b/indra/newview/quickprefs.cpp
index 46ef93150b..f098389d6c 100644
--- a/indra/newview/quickprefs.cpp
+++ b/indra/newview/quickprefs.cpp
@@ -1402,6 +1402,12 @@ void FloaterQuickPrefs::onValuesChanged()
 		return;
 	}
 
+	// don't crash when we try to update values without having a control selected
+	if(mSelectedControl=="")
+	{
+		return;
+	}
+
 	// remember the current and possibly new control names
 	std::string old_control_name=mSelectedControl;
 	std::string new_control_name=mControlNameCombo->getValue();

From db4c9e7158f9135f10da912f9c72abee14d64868 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sat, 22 Nov 2014 03:12:02 +0100
Subject: [PATCH 132/229] FIRE-14999: Skin and selection beam previews are
 black Starlight skins has "White" defined as "0 0 0 1" (which is in fact
 black) Preview images needs to ALWAYS be white anyway, si it's safe to
 hardcode color like that

---
 .../skins/default/xui/en/panel_preferences_firestorm.xml  | 8 ++++----
 .../skins/default/xui/en/panel_preferences_skins.xml      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index a08b8805e0..ab1a3e3b8b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -875,8 +875,8 @@
          name="PhoenixBeamPrev_rainbow"
          label=""
          scale_image="true"
-         image_color="White"
-         image_color_disabled="White"
+         image_color="1 1 1 1"
+         image_color_disabled="1 1 1 1"
          image_selected="beam_rainbow.png"
          image_unselected="beam_rainbow.png"
          image_hover_selected="beam_rainbow.png"
@@ -992,8 +992,8 @@
          height="80"
          name="PhoenixBeamPrev_Phoenix"
          label=""
-         image_color="White"
-         image_color_disabled="White"
+         image_color="1 1 1 1"
+         image_color_disabled="1 1 1 1"
          scale_image="true"
          image_selected="beam_phoenix.png"
          image_unselected="beam_phoenix.png"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_skins.xml b/indra/newview/skins/default/xui/en/panel_preferences_skins.xml
index 2b95352833..063e66b50b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_skins.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_skins.xml
@@ -11,8 +11,8 @@
  name="skin_panel">
 
     <button
-     image_color="White"
-     image_color_disabled="White"
+     image_color="1 1 1 1"
+     image_color_disabled="1 1 1 1"
      scale_image="true"
      display_pressed_state="false"
      hover_glow_amount="0.0"

From 6982e9165fa931483ee3dab6c6920849ef780221 Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Sat, 22 Nov 2014 03:56:28 +0100
Subject: [PATCH 133/229] FIRE-15000 - fix Starlight CUI Custom Light theme not
 being available on Linux

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

diff --git a/indra/newview/skins/skins.xml b/indra/newview/skins/skins.xml
index da36a8f00b..20bba4a4a8 100644
--- a/indra/newview/skins/skins.xml
+++ b/indra/newview/skins/skins.xml
@@ -186,7 +186,7 @@
           <key>name</key>
           <string>Custom Light</string>
           <key>folder</key>
-          <string>custom_Light</string>
+          <string>custom_light</string>
         </map>
       </array>
     </map>

From a9596093a4ad8e7f79c541b243d813bb15bab150 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 22 Nov 2014 11:02:54 +0100
Subject: [PATCH 134/229] SL-White...

---
 .../skins/default/xui/en/panel_preferences_firestorm.xml  | 8 ++++----
 .../skins/default/xui/en/panel_preferences_skins.xml      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index ab1a3e3b8b..97feb54a7a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -875,8 +875,8 @@
          name="PhoenixBeamPrev_rainbow"
          label=""
          scale_image="true"
-         image_color="1 1 1 1"
-         image_color_disabled="1 1 1 1"
+         image_color="SL-White"
+         image_color_disabled="SL-White"
          image_selected="beam_rainbow.png"
          image_unselected="beam_rainbow.png"
          image_hover_selected="beam_rainbow.png"
@@ -992,8 +992,8 @@
          height="80"
          name="PhoenixBeamPrev_Phoenix"
          label=""
-         image_color="1 1 1 1"
-         image_color_disabled="1 1 1 1"
+         image_color="SL-White"
+         image_color_disabled="SL-White"
          scale_image="true"
          image_selected="beam_phoenix.png"
          image_unselected="beam_phoenix.png"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_skins.xml b/indra/newview/skins/default/xui/en/panel_preferences_skins.xml
index 063e66b50b..5e97705f0a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_skins.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_skins.xml
@@ -11,8 +11,8 @@
  name="skin_panel">
 
     <button
-     image_color="1 1 1 1"
-     image_color_disabled="1 1 1 1"
+     image_color="SL-White"
+     image_color_disabled="SL-White"
      scale_image="true"
      display_pressed_state="false"
      hover_glow_amount="0.0"

From 5ab0c0b699e8bbae7ad0171198c812100986cf31 Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Sat, 22 Nov 2014 11:49:34 -0600
Subject: [PATCH 135/229] Updating 32-bit Darwin SLPlugin to prerelease
 version.

---
 autobuild.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index f35ea233bf..96798bacd5 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2404,9 +2404,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6849432c00ee2db495016c45f0f30122</string>
+              <string>7dde5d6bfa45124a4c7b342a7a4f3f77</string>
               <key>url</key>
-              <string>http://downloads.phoenixviewer.com/slplugin_x86-1.0-darwin-20140630.tar.bz2</string>
+              <string>http://downloads.phoenixviewer.com/slplugin_x86-4.6.9.42958-darwin-20141122.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>

From f6de589fd8a23fef8d6524920e62f50ec3791597 Mon Sep 17 00:00:00 2001
From: Jessica <none@none>
Date: Sat, 22 Nov 2014 16:32:52 -0500
Subject: [PATCH 136/229] Adding AVIWORLDS to grids.fallback... and fsdata.

---
 indra/newview/app_settings/grids.fallback.xml | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/indra/newview/app_settings/grids.fallback.xml b/indra/newview/app_settings/grids.fallback.xml
index a6fe8a0183..9de72b2a1e 100644
--- a/indra/newview/app_settings/grids.fallback.xml
+++ b/indra/newview/app_settings/grids.fallback.xml
@@ -1,5 +1,41 @@
 <llsd>
     <map>
+    <key>login.aviworlds.com:8002</key>
+      <map>
+        <key>LastModified</key>
+        <date>2014-11-22T20:36:26.43Z</date>
+        <key>about</key>
+        <string>http://aviworlds.com</string>
+        <key>gatekeeper</key>
+        <string>login.aviworlds.com:8002</string>
+        <key>gridname</key>
+        <string>AviWorlds</string>
+        <key>gridnick</key>
+        <string>AviWorlds</string>
+        <key>helperuri</key>
+        <string>http://login.aviworlds.com/backend/components/com_opensim/</string>
+        <key>login_identifier_types</key>
+        <array>
+          <string>agent</string>
+          <string>account</string>
+        </array>
+        <key>loginpage</key>
+        <string>http://login.aviworlds.com/splash/</string>
+        <key>loginuri</key>
+        <array>
+          <string>http://login.aviworlds.com:8002/</string>
+        </array>
+        <key>name</key>
+        <string>login.aviworlds.com:8002</string>
+        <key>password</key>
+        <string>http://login.aviworlds.com:8002/wifi/forgotpassword</string>
+        <key>platform</key>
+        <string>OpenSim</string>
+        <key>register</key>
+        <string>http://login.aviworlds.com:8002/wifi/user/account</string>
+        <key>slurl_base</key>
+        <string>hop://login.aviworlds.com:8002/</string>
+      </map>
     <key>craft-world.org:8002</key>
         <map>
         <key>LastModified</key>

From 2b787ead2913f4aafd07f9892b78a80722b55e17 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 24 Nov 2014 09:54:09 +0100
Subject: [PATCH 137/229] Fix EOL

---
 indra/newview/fsnearbychatcontrol.cpp | 44 +++++++++++++--------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/indra/newview/fsnearbychatcontrol.cpp b/indra/newview/fsnearbychatcontrol.cpp
index 4783ad6abe..56c4602d09 100644
--- a/indra/newview/fsnearbychatcontrol.cpp
+++ b/indra/newview/fsnearbychatcontrol.cpp
@@ -357,28 +357,28 @@ BOOL FSNearbyChatControl::handleKeyHere(KEY key, MASK mask )
 	}
 	else if( KEY_RETURN == key )
 	{
-		if (mask == MASK_CONTROL && gSavedSettings.getBOOL("FSUseCtrlShout"))
-		{
-			// shout
-			type = CHAT_TYPE_SHOUT;
-			handled = TRUE;
-		}
-		else if (mask == MASK_SHIFT && gSavedSettings.getBOOL("FSUseShiftWhisper"))
-		{
-			// whisper
-			type = CHAT_TYPE_WHISPER;
-			handled = TRUE;
-		}
-		else if (mask == MASK_ALT && gSavedSettings.getBOOL("FSUseAltOOC"))
-		{
-			// OOC
-			type = CHAT_TYPE_OOC;
-			handled = TRUE;
-		}
-		else if (mask == MASK_NONE)
-		{
-			// say
-			type = CHAT_TYPE_NORMAL;
+		if (mask == MASK_CONTROL && gSavedSettings.getBOOL("FSUseCtrlShout"))
+		{
+			// shout
+			type = CHAT_TYPE_SHOUT;
+			handled = TRUE;
+		}
+		else if (mask == MASK_SHIFT && gSavedSettings.getBOOL("FSUseShiftWhisper"))
+		{
+			// whisper
+			type = CHAT_TYPE_WHISPER;
+			handled = TRUE;
+		}
+		else if (mask == MASK_ALT && gSavedSettings.getBOOL("FSUseAltOOC"))
+		{
+			// OOC
+			type = CHAT_TYPE_OOC;
+			handled = TRUE;
+		}
+		else if (mask == MASK_NONE)
+		{
+			// say
+			type = CHAT_TYPE_NORMAL;
 			handled = TRUE;
 		}
 		else

From 4039df36690916abf15beeaf77a6744e5715e20d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 24 Nov 2014 11:23:59 +0100
Subject: [PATCH 138/229] FIRE-15013 / CHUI-914 / CHUI-932: Spaces in nearby
 chat get trimmed

---
 indra/newview/fsfloaternearbychat.cpp | 5 ++++-
 indra/newview/fsnearbychathub.cpp     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index 5a50bc9714..6f1ce7d9e4 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -1015,7 +1015,10 @@ void FSFloaterNearbyChat::sendChat( EChatType type )
 				utf8text = applyMuPose(utf8text);
 				
 				// discard returned "found" boolean
-				LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text);
+				if(!LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text))
+				{
+					utf8_revised_text = utf8text;
+				}
 			}
 			else
 			{
diff --git a/indra/newview/fsnearbychathub.cpp b/indra/newview/fsnearbychathub.cpp
index d8535f0834..19f80b0c5f 100644
--- a/indra/newview/fsnearbychathub.cpp
+++ b/indra/newview/fsnearbychathub.cpp
@@ -480,7 +480,10 @@ void FSNearbyChat::sendChat(LLWString text, EChatType type)
 			utf8text = applyMuPose(utf8text);
 
 			// discard returned "found" boolean
-			LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text);
+			if(!LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text))
+			{
+				utf8_revised_text = utf8text;
+			}
 		}
 		else
 		{

From 36f6e3b25a7033327b0cc00ef24ae5f147744595 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 24 Nov 2014 11:29:59 +0100
Subject: [PATCH 139/229] FIRE-15015: Syntax Highlight missing for
 CHANGED_REGION_RESTART in OpenSim

---
 indra/newview/app_settings/scriptlibrary_ossl.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/app_settings/scriptlibrary_ossl.xml b/indra/newview/app_settings/scriptlibrary_ossl.xml
index 35e7dacef5..8bdfaaad65 100644
--- a/indra/newview/app_settings/scriptlibrary_ossl.xml
+++ b/indra/newview/app_settings/scriptlibrary_ossl.xml
@@ -12,6 +12,7 @@
 		<integer_constant name="OS_ATTACH_MSG_OBJECT_CREATOR" desc="Send only to those have the same CreatorID with host object CreatorID" />
 		<integer_constant name="OS_ATTACH_MSG_SCRIPT_CREATOR" desc="Send only to those have the same CreatorID with sender script CreatorID" />
 		
+		<integer_constant name="CHANGED_REGION_RESTART" desc="Parameter of changed event handler used to indicate the region has been restarted." />
 		<integer_constant name="CHANGED_ANIMATION" desc="The set of animations playing on the avatar to whom this object is attached has been changed." />
 		<integer_constant name="LIST_STAT_HARMONIC_MEAN" desc="Returns the harmonic mean of a list of numbers, Value 100." />
 		<integer_constant name="CAMERA_FOCUS_OFFSET_X" desc="Adjusts the camera focus x position relative to the target. (float)" />

From f282c4d71de6ec86ee86a79fcc681ad359d0d4ce Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 24 Nov 2014 14:03:00 +0100
Subject: [PATCH 140/229] // <FS:Ansariel> FIRE-13838 / VWR-29517: Text and
 link from other tools is presented in Land tool from Build floater

---
 indra/newview/llfloatertools.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 85bbb0bb13..cd7ff22bb7 100755
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -674,9 +674,16 @@ void LLFloaterTools::refresh()
 		getChild<LLTextBox>("selection_count")->setText(selection_info.str());
 
 		bool have_selection = !LLSelectMgr::getInstance()->getSelection()->isEmpty();
-		childSetVisible("selection_count",  have_selection);
-		childSetVisible("remaining_capacity", have_selection);
-		childSetVisible("selection_empty", !have_selection);
+		// <FS:Ansariel> FIRE-13838 / VWR-29517: Text and link from other tools is presented in Land tool from Build floater
+		//childSetVisible("selection_count",  have_selection);
+		//childSetVisible("remaining_capacity", have_selection);
+		//childSetVisible("selection_empty", !have_selection);
+		LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
+		bool land_visible = (tool == LLToolBrushLand::getInstance() || tool == LLToolSelectLand::getInstance() );
+		childSetVisible("selection_count", !land_visible && have_selection);
+		childSetVisible("remaining_capacity", !land_visible && have_selection);
+		childSetVisible("selection_empty", !land_visible && !have_selection);
+		// </FS:Ansariel>
 	}
 
 	// <FS> disable the object and prim counts if nothing selected

From 52240704449a54fc62c12b835f1a199c04282e44 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Mon, 24 Nov 2014 17:55:30 +0100
Subject: [PATCH 141/229] Tip to default branch.

---
 README_BUILD_FIRESTORM_LINUX.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README_BUILD_FIRESTORM_LINUX.txt b/README_BUILD_FIRESTORM_LINUX.txt
index 1bf208924e..8c7bdb61ad 100755
--- a/README_BUILD_FIRESTORM_LINUX.txt
+++ b/README_BUILD_FIRESTORM_LINUX.txt
@@ -41,9 +41,7 @@ Typical LL autobuild configure options should also work, as long as they don't d
 already doing.
 
 Logs:
-
         Look for logs in build-linux-i686/logs
 
 Output:
-
         Look for output in build-linux-i686/newview/Release

From acf9901048fcf4ce64a9e803f2180abab092bdcd Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Mon, 24 Nov 2014 18:03:11 +0100
Subject: [PATCH 142/229] Tip to default.

---
 README_BUILD_FIRESTORM_WIN64.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README_BUILD_FIRESTORM_WIN64.txt b/README_BUILD_FIRESTORM_WIN64.txt
index 118684f113..5e48852ac3 100755
--- a/README_BUILD_FIRESTORM_WIN64.txt
+++ b/README_BUILD_FIRESTORM_WIN64.txt
@@ -21,4 +21,3 @@ autobuild -m64 configure -c ReleaseFS -- --chan <channel> --package -DFS_UPGRADE
 autobuild -m64 build -c ReleaseFS --no_configure
 
 The resulting installer/exe gets created in build-vc100_x64/newview/Release
-

From 39c744e601fc445965466f382094176067745266 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sun, 30 Nov 2014 01:50:24 +0100
Subject: [PATCH 143/229] FIRE-14935; If the state of the plugin roo fast, the
 correct URI to load was never set. Make sure we're toggling the URI if needed
 even when past INIT_STATE_NAVIGATE_COMPLETE.

---
 indra/media_plugins/webkit/media_plugin_webkit.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 26d21766ee..a23f8939a2 100755
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -160,7 +160,10 @@ private:
 
 		checkEditState();
 		
-		if(mInitState == INIT_STATE_NAVIGATE_COMPLETE)
+		// <FS:ND> FIRE-14935; Make sure to load URI even if state changes are happing rapidly
+		// if(mInitState == INIT_STATE_NAVIGATE_COMPLETE)
+		if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
+		// </FS:ND>
 		{
 			if(!mInitialNavigateURL.empty())
 			{
@@ -458,7 +461,10 @@ private:
 	// virtual
 	void onNavigateBegin(const EventType& event)
 	{
-		if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
+		// <FS:ND> FIRE-14935; Do not switch URI if there is still a saved URI to load
+		// if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
+		if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE && mInitialNavigateURL.empty() )
+		// </FS:ND>
 		{
 			LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "navigate_begin");
 			message.setValue("uri", event.getEventUri());

From a1f2bf1bf614c880af7a1139e826b5701f91697e Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 2 Dec 2014 22:11:41 +0100
Subject: [PATCH 144/229] Tip to default.

---
 README_BUILD_FIRESTORM_WIN32.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README_BUILD_FIRESTORM_WIN32.txt b/README_BUILD_FIRESTORM_WIN32.txt
index 935e031930..a9690dcd64 100755
--- a/README_BUILD_FIRESTORM_WIN32.txt
+++ b/README_BUILD_FIRESTORM_WIN32.txt
@@ -2,7 +2,7 @@ Before you start configuring your Windows build system, be aware of our tested c
 	Memory: You will need at least 2GB RAM, 4GB strongly recommended.
 	CPU: Multiple CPUs are strongly recommended. 
 	  A build can take over an hour.
-	Visual Studio 2010. 
+	Visual Studio 2010 SP1. 
 
 Ensure you can build a stock viewer-development try as described in the SL wiki. Before asking for any help
 compiling Firestorm, make sure you can build viewer-development first. If you try and skip this step, you may

From 1b903e8fb8e6d7c38803bb4d1eb40bd95e48c815 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Tue, 2 Dec 2014 23:22:10 +0100
Subject: [PATCH 145/229] FIRE-15048: Drop down menu on Region Restart notice
 missing in Starlight and Starlight CUI skins (addition for 797741833842 )

---
 .../xui/en/floater_region_restarting.xml      | 36 ++++++++++++++++---
 .../xui/en/floater_region_restarting.xml      | 36 ++++++++++++++++---
 2 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/indra/newview/skins/starlight/xui/en/floater_region_restarting.xml b/indra/newview/skins/starlight/xui/en/floater_region_restarting.xml
index 1b335d4b75..463c6d79cc 100644
--- a/indra/newview/skins/starlight/xui/en/floater_region_restarting.xml
+++ b/indra/newview/skins/starlight/xui/en/floater_region_restarting.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="150"
+ height="200"
  width="290"
  layout="topleft"
  name="region_restarting"
@@ -19,9 +19,9 @@ If you stay in this region you will be logged out.
     </string>
     <panel
      name="layout_panel_1"
-     height="150"
-     width="290"
-     follows="right|top"
+     right="-1"
+     bottom="-1"
+     follows="all"
      top="0"
      left="0"
      background_visible="true"
@@ -71,5 +71,33 @@ If you stay in this region you will be logged out.
      Seconds until restart
      32767
     </text>
+    <combo_box
+     allow_text_entry="true"
+     follows="top|right"
+     height="23"
+     label="My Landmarks"
+     layout="topleft"
+     top_pad="10"
+     left="30"
+     max_chars="64"
+     name="landmark combo"
+     right="-50"
+     width="182">
+        <combo_box.item
+         label="My Landmarks"
+         name="item1"
+         value="None" />
+    </combo_box>
+    <button
+     follows="top|left"
+     height="23"
+     image_overlay="Arrow_Right"
+     image_overlay_alignment="center"
+     tool_tip="Teleport to Landmark"
+     layout="topleft"
+     left_pad="1"
+     name="teleport_btn"
+     top_delta="0"
+     width="28" />
   </panel>
  </floater>
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_region_restarting.xml b/indra/newview/skins/starlightcui/xui/en/floater_region_restarting.xml
index 1b335d4b75..463c6d79cc 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_region_restarting.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_region_restarting.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="150"
+ height="200"
  width="290"
  layout="topleft"
  name="region_restarting"
@@ -19,9 +19,9 @@ If you stay in this region you will be logged out.
     </string>
     <panel
      name="layout_panel_1"
-     height="150"
-     width="290"
-     follows="right|top"
+     right="-1"
+     bottom="-1"
+     follows="all"
      top="0"
      left="0"
      background_visible="true"
@@ -71,5 +71,33 @@ If you stay in this region you will be logged out.
      Seconds until restart
      32767
     </text>
+    <combo_box
+     allow_text_entry="true"
+     follows="top|right"
+     height="23"
+     label="My Landmarks"
+     layout="topleft"
+     top_pad="10"
+     left="30"
+     max_chars="64"
+     name="landmark combo"
+     right="-50"
+     width="182">
+        <combo_box.item
+         label="My Landmarks"
+         name="item1"
+         value="None" />
+    </combo_box>
+    <button
+     follows="top|left"
+     height="23"
+     image_overlay="Arrow_Right"
+     image_overlay_alignment="center"
+     tool_tip="Teleport to Landmark"
+     layout="topleft"
+     left_pad="1"
+     name="teleport_btn"
+     top_delta="0"
+     width="28" />
   </panel>
  </floater>

From 8ff4ea597a6019d18b6f5d19b93360fcaac1cdeb Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Tue, 2 Dec 2014 23:49:53 +0100
Subject: [PATCH 146/229] FIRE-15045: [OpenSim] Syntax Highlight missing

---
 indra/newview/app_settings/scriptlibrary_ossl.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/indra/newview/app_settings/scriptlibrary_ossl.xml b/indra/newview/app_settings/scriptlibrary_ossl.xml
index 8bdfaaad65..e78fd0fb0d 100644
--- a/indra/newview/app_settings/scriptlibrary_ossl.xml
+++ b/indra/newview/app_settings/scriptlibrary_ossl.xml
@@ -144,7 +144,7 @@
 		<function name="osSetEstateSunSettings" sleep="0.0" energy="10.0"
 			desc="osSetEstateSunSettings(integer sunFixed, float sunHour);Set current estate's sun settings" />
 		<function name="osGetCurrentSunHour" sleep="0.0" energy="10.0"
-		desc="float osGetCurrentSunHour();Returns the value of the current region's sun hour" />
+			desc="float osGetCurrentSunHour();Returns the value of the current region's sun hour" />
 		<function name="osGetSunParam" sleep="0.0" energy="10.0"
 			desc="string osGetSunParam(string param);Returns region's current sun parameters.;Param are: day_length, year_length, day_night_offset, update_interval." />
 		<function name="osSetSunParam" sleep="0.0" energy="10.0"
@@ -297,6 +297,12 @@
 			desc="string osLoadedCreationID();Returns the original UUID of the current region" />
 		<function name="osGetLinkPrimitiveParams" sleep="0.0" energy="10.0"
 			desc="list osGetLinkPrimitiveParams(integer link_num, list parameters);Returns prim params for the prim specified by link_num" />
+		<function name="osForceCreateLink" sleep="0.0" energy="10.0"
+			desc="osForceCreateLink(key target, int parent);Idential to llCreateLink() except that it doesn't require the link permission to be granted. Attempt to link the script's object with target." />
+		<function name="osForceBreakLink" sleep="0.0" energy="10.0"
+			desc="osForceBreakLink(integer link);to llBreakLink(integer link) except that it doesn't require the link permission to be granted. Delinks the prim with the given link number in a linked object set." />
+		<function name="osForceBreakAllLinks" sleep="0.0" energy="10.0"
+			desc="osForceBreakAllLinks();Identical to llBreakAllLinks() except that it doesn't require the link permission to be granted. Delinks all prims in the link set." />
 		<function name="osIsNpc" sleep="0.0" energy="10.0"
 			desc="integer osIsNpc(key npc);Returns 1 if TRUE, 0 if FALSE" />
 		<function name="osNpcCreate" sleep="0.0" energy="10.0"
@@ -338,7 +344,7 @@
 		<function name="osNpcStopAnimation" sleep="0.0" energy="10.0"
 			desc="osNpcStopAnimation(key npc, string animation);Stops animation being played by the NPC" />
 		<function name="osOwnerSaveAppearance" sleep="0.0" energy="10.0"
-		desc="key osOwnerSaveAppearance(string notecard);Creates a notecard with the object owner&apos;s current appearance inside the object" />
+			desc="key osOwnerSaveAppearance(string notecard);Creates a notecard with the object owner&apos;s current appearance inside the object" />
 		<function name="osAgentSaveAppearance" sleep="0.0" energy="10.0"
 			desc="key osAgentSaveAppearance(key avatar, string notecard);Creates a notecard with the specified avatar&apos;s current appearance inside the object" />
 		<function name="osGetMapTexture" sleep="0.0" energy="10.0"

From c1e5a87485899145bca66f4fa443ec7f7c44dc62 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Wed, 3 Dec 2014 02:54:20 +0100
Subject: [PATCH 147/229] FIRE-15051: Show blacklisted agents as "Resident"
 instead of "Object" for Type on the Asset Blacklist floater

---
 indra/newview/fsfloaterwsassetblacklist.cpp                | 3 +++
 indra/newview/fswsassetblacklist.cpp                       | 3 +++
 indra/newview/llavataractions.cpp                          | 2 +-
 indra/newview/llviewermenu.cpp                             | 7 +++++--
 .../skins/default/xui/en/floater_asset_blacklist.xml       | 4 ++++
 .../skins/default/xui/pl/floater_asset_blacklist.xml       | 3 +++
 6 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/indra/newview/fsfloaterwsassetblacklist.cpp b/indra/newview/fsfloaterwsassetblacklist.cpp
index d1e7dec5c5..a50104490a 100644
--- a/indra/newview/fsfloaterwsassetblacklist.cpp
+++ b/indra/newview/fsfloaterwsassetblacklist.cpp
@@ -61,6 +61,9 @@ std::string FSFloaterWSAssetBlacklist::getTypeString(S32 type)
 		case 6:
 			return getString("asset_object");
 			break;
+		case 45:
+			return getString("asset_resident");
+			break;
 		default:
 			return getString("asset_unknown");
 			break;
diff --git a/indra/newview/fswsassetblacklist.cpp b/indra/newview/fswsassetblacklist.cpp
index aa12ae59c8..d0d3bed04d 100644
--- a/indra/newview/fswsassetblacklist.cpp
+++ b/indra/newview/fswsassetblacklist.cpp
@@ -53,6 +53,9 @@ LLAssetType::EType S32toAssetType(S32 assetindex)
 		case 6:
 			type = LLAssetType::AT_OBJECT;
 			break;
+		case 45:
+			type = LLAssetType::AT_PERSON;
+			break;
 		default:
 			type = LLAssetType::AT_NONE;
 	}
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index c9e204c488..3f8238e387 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -2150,7 +2150,7 @@ void LLAvatarActions::onDerenderAvatarNameLookup(const LLUUID& agent_id, const L
 {
 	if (permanent)
 	{
-		FSWSAssetBlacklist::getInstance()->addNewItemToBlacklist(agent_id, av_name.getUserName(), "", LLAssetType::AT_OBJECT);
+		FSWSAssetBlacklist::getInstance()->addNewItemToBlacklist(agent_id, av_name.getUserName(), "", LLAssetType::AT_PERSON);
 	}
 
 	LLViewerObject* av_obj = gObjectList.findObject(agent_id);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 99985041b5..bad67fe854 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2793,12 +2793,14 @@ void derenderObject(bool permanent)
 			{
 				std::string entry_name = "";
 				std::string region_name;
+				LLAssetType::EType asset_type;
 
 				if (objp->isAvatar())
 				{
 					LLNameValue* firstname = objp->getNVPair("FirstName");
 					LLNameValue* lastname = objp->getNVPair("LastName");
-					entry_name = llformat("%s %s" ,firstname->getString(), lastname->getString());
+					entry_name = llformat("%s %s", firstname->getString(), lastname->getString());
+					asset_type = LLAssetType::AT_PERSON;
 				}
 				else
 				{
@@ -2815,9 +2817,10 @@ void derenderObject(bool permanent)
 					{
 						region_name = region->getName();
 					}
+					asset_type = LLAssetType::AT_OBJECT;
 				}
 			
-				FSWSAssetBlacklist::getInstance()->addNewItemToBlacklist(objp->getID(), entry_name, region_name, LLAssetType::AT_OBJECT);
+				FSWSAssetBlacklist::getInstance()->addNewItemToBlacklist(objp->getID(), entry_name, region_name, asset_type);
 			}
 
 			select_mgr->deselectObjectOnly(objp);
diff --git a/indra/newview/skins/default/xui/en/floater_asset_blacklist.xml b/indra/newview/skins/default/xui/en/floater_asset_blacklist.xml
index c6ca6f92e9..591ae83e40 100644
--- a/indra/newview/skins/default/xui/en/floater_asset_blacklist.xml
+++ b/indra/newview/skins/default/xui/en/floater_asset_blacklist.xml
@@ -23,6 +23,10 @@ Texture
 	<floater.string
 		name="asset_sound">
 Sound
+	</floater.string>
+	<floater.string
+		name="asset_resident">
+Resident
 	</floater.string>
 	<floater.string
 		name="asset_unknown">
diff --git a/indra/newview/skins/default/xui/pl/floater_asset_blacklist.xml b/indra/newview/skins/default/xui/pl/floater_asset_blacklist.xml
index a12ce7c90d..82d1005f26 100644
--- a/indra/newview/skins/default/xui/pl/floater_asset_blacklist.xml
+++ b/indra/newview/skins/default/xui/pl/floater_asset_blacklist.xml
@@ -9,6 +9,9 @@
 	<floater.string name="asset_sound">
 		Dźwięk
 	</floater.string>
+	<floater.string name="asset_resident">
+		Rezydent
+	</floater.string>
 	<floater.string name="asset_unknown">
 		Nieznany
 	</floater.string>

From dcccfb5ea9a9523e6dd7f4088564daad99d04d4f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 3 Dec 2014 22:58:43 +0100
Subject: [PATCH 148/229] Updated German translation

---
 indra/newview/skins/default/xui/de/floater_asset_blacklist.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/newview/skins/default/xui/de/floater_asset_blacklist.xml b/indra/newview/skins/default/xui/de/floater_asset_blacklist.xml
index 1c1e0d47ca..28a1d6f53d 100644
--- a/indra/newview/skins/default/xui/de/floater_asset_blacklist.xml
+++ b/indra/newview/skins/default/xui/de/floater_asset_blacklist.xml
@@ -9,6 +9,9 @@
 	<floater.string name="asset_sound">
 		Sound
 	</floater.string>
+	<floater.string name="asset_resident">
+		Einwohner
+	</floater.string>
 	<floater.string name="asset_unknown">
 		Unbekannt
 	</floater.string>

From fa6119491ad170f0da126bdc7745ff2eda265859 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 4 Dec 2014 00:01:06 +0100
Subject: [PATCH 149/229] FIRE-15062: Align icon on the left of avatar name in
 pay dialogs to avoid pushing it outside the window

---
 indra/newview/skins/default/xui/en/floater_pay.xml        | 1 +
 indra/newview/skins/default/xui/en/floater_pay_object.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml
index 39ce0afd64..b28e934c61 100755
--- a/indra/newview/skins/default/xui/en/floater_pay.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay.xml
@@ -19,6 +19,7 @@
    </string>
 
     <text
+     icon_positioning="left"
      type="string"
      length="1"
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml
index 2f829d5b13..264344ec00 100755
--- a/indra/newview/skins/default/xui/en/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml
@@ -18,6 +18,7 @@
         Pay Resident
     </string>
     <text
+     icon_positioning="left"
      follows="left|top"
      height="16"
      layout="topleft"

From cf13fe2d77f22341797515d13a6c9cc9eb6236b2 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 4 Dec 2014 18:27:29 +0100
Subject: [PATCH 150/229] Link threshold factor for lowering bias based on
 total texture memory to the same value when textures will be destroyed so
 bias will not get stuck in texture intense areas

---
 indra/newview/llviewertexture.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 779d15909c..b83bc54509 100755
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -545,6 +545,10 @@ void LLViewerTexture::updateClass(const F32 velocity, const F32 angular_velocity
 	sMaxTotalTextureMem = gTextureList.getMaxTotalTextureMem();
 	sMaxDesiredTextureMem = sMaxTotalTextureMem; //in Bytes, by default and when total used texture memory is small.
 
+	// <FS:Ansariel> Link threshold factor for lowering bias based on total texture memory to the same value
+	//               textures will be destroyed
+	static LLCachedControl<F32> fsDestroyGLTexturesThreshold(gSavedSettings, "FSDestroyGLTexturesThreshold");
+
 	if (sBoundTextureMemory >= sMaxBoundTextureMem ||
 		sTotalTextureMemory >= sMaxTotalTextureMem)
 	{
@@ -575,7 +579,11 @@ void LLViewerTexture::updateClass(const F32 velocity, const F32 angular_velocity
 	}
 	else if (sDesiredDiscardBias > 0.0f &&
 			 sBoundTextureMemory < sMaxBoundTextureMem * texmem_lower_bound_scale &&
-			 sTotalTextureMemory < sMaxTotalTextureMem * texmem_lower_bound_scale)
+			 // <FS:Ansariel> Link threshold factor for lowering bias based on total texture memory to the same value
+			 //               textures will be destroyed
+			 //sTotalTextureMemory < sMaxTotalTextureMem * texmem_lower_bound_scale)
+			 sTotalTextureMemory < sMaxTotalTextureMem * fsDestroyGLTexturesThreshold())
+			 // </FS:Ansariel>
 	{			 
 		// If we are using less texture memory than we should,
 		// scale down the desired discard level

From 330f204964b6c6045b695423c7d64effb936915f Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Thu, 4 Dec 2014 10:37:35 -0800
Subject: [PATCH 151/229] Add GeForce 960/5M cards

---
 indra/newview/gpu_table.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 80233f5ad0..d8308da328 100755
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -481,6 +481,7 @@ NVIDIA GTX 850M							.*NVIDIA .*GTX *85[0-9]M.*							5	1	0	4.4
 NVIDIA GTX 860M							.*NVIDIA .*GTX *86[0-9]M.*							5	1	0	4.4
 NVIDIA GTX 870M							.*NVIDIA .*GTX *87[0-9]M.*							5	1	0	4.4
 NVIDIA GTX 880M							.*NVIDIA .*GTX *88[0-9]M.*							5	1	0	4.4
+NVIDIA GTX 960M							.*NVIDIA .*GTX *96[0-9]M.*							5	1	0	4.4
 NVIDIA GTX 970M							.*NVIDIA .*GTX *97[0-9]M.*							5	1	0	4.4
 NVIDIA GTX 980M							.*NVIDIA .*GTX *98[0-9]M.*							5	1	0	4.4
 NVIDIA G100								.*NVIDIA .*G10.*									3	1	1	3.3

From 76c161dfb0b6ed22d9e8c89454000d4d3e5086a3 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Mon, 8 Dec 2014 00:35:03 +0100
Subject: [PATCH 152/229] Minor Polish translation update

---
 .../newview/skins/default/xui/pl/panel_preferences_colors.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
index a0ef084c96..9d826f906d 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
@@ -183,6 +183,10 @@
 			</text>
 			<color_swatch name="console_background" tool_tip="Wybierz kolor konsoli"/>
 			<slider label="Przezroczystość:" name="console_background_opacity" tool_tip="Wybierz przezroczystość tła konsoli"/>
+			<text name="preferences_search_label">
+				Podśw. wyników wyszukiwania w opcjach:
+			</text>
+			<color_swatch name="preferences_search_color" tool_tip="Wybierz kolor dla podświetlenia wyników wyszukiwania w opcjach"/>
 			<check_box name="FSScriptDialogNoTransparency" label="Okna dialogowe skryptów zawsze na nieprzejrzystym tle"/>
 			<check_box name="FSGroupNotifyNoTransparency" label="Ogłoszenia grupowe zawsze na nieprzejrzystym tle"/>
 			<check_box name="override_pie_color_checkbox" label="Nadpisz przezroczystość i kolor tła menu kołowego:"/>

From 59f2f8b8478be91fe15f8bb29ae7e9232c4c2abb Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Mon, 8 Dec 2014 02:03:46 +0100
Subject: [PATCH 153/229] Proposed changes for 'Move & View' tab: Early,
 initial rework in Preferences ... this always can be backed out.

---
 .../default/xui/da/panel_preferences_move.xml |   3 +
 .../default/xui/de/panel_preferences_move.xml |  41 +-
 .../default/xui/en/panel_preferences_move.xml | 352 +++++++++---------
 .../default/xui/es/panel_preferences_move.xml |  37 +-
 .../default/xui/fr/panel_preferences_move.xml |   3 +
 .../default/xui/it/panel_preferences_move.xml |  30 +-
 .../default/xui/ja/panel_preferences_move.xml |  48 +--
 .../default/xui/pl/panel_preferences_move.xml |  35 +-
 .../default/xui/pt/panel_preferences_move.xml |   3 +
 .../default/xui/ru/panel_preferences_move.xml |  29 +-
 .../default/xui/tr/panel_preferences_move.xml |  81 ++--
 .../default/xui/zh/panel_preferences_move.xml |  49 +--
 12 files changed, 363 insertions(+), 348 deletions(-)

diff --git a/indra/newview/skins/default/xui/da/panel_preferences_move.xml b/indra/newview/skins/default/xui/da/panel_preferences_move.xml
index e8e4b3b5ee..6ea5f8083e 100755
--- a/indra/newview/skins/default/xui/da/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_move.xml
@@ -11,6 +11,9 @@
 			<check_box label="Byg/Redigér" name="edit_camera_movement" tool_tip="Benyt automatisk kamera positionering når edit modus aktiveres og forlades"/>
 			<check_box label="Udseende" name="appearance_camera_movement" tool_tip="Benyt automatisk kamera positionering i edit modus"/>
 			<check_box initial_value="sand" label="Sidepanel" name="appearance_sidebar_positioning" tool_tip="Benyt automatisk kamera positionering ved sidepanel"/>
+		</panel>
+		<!--Mouselook-->
+		<panel name="tab-mouselook">
 			<check_box label="Vis avatar i første-person" name="first_person_avatar_visible"/>
 			<text name="Mouse Sensitivity">
 				Muse-følsomhed i første-person:
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_move.xml b/indra/newview/skins/default/xui/de/panel_preferences_move.xml
index 37d3f702d8..d83bc8f6f5 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_move.xml
@@ -15,6 +15,22 @@
 			<check_box label="Bauen/Bearbeiten" name="edit_camera_movement" tool_tip="Automatische Kamerapositionierung bei Wechsel in und aus dem Bearbeitungsmodus verwenden"/>
 			<check_box label="Aussehen" name="appearance_camera_movement" tool_tip="Automatische Kamerapositionierung im Bearbeitenmodus verwenden"/>
 			<check_box label="Zusätzliche Beleuchtung aktivieren" name="EditAppearanceLighting" tool_tip="Aktiviert die zusätzliche Beleuchtung, wenn die Form des Avatars bearbeitet wird."/>
+			<check_box label="Klick auf Avatar hält Kameraposition" name="clickonavatarkeepscamera" tool_tip="Normalerweise wird die Kameraposition beim Anklicken des Avatars zurückgesetzt. Diese Option verhindert dieses Verhalten."/>
+			<check_box label="Kameraposition nach Teleport zurücksetzen (innerhalb einer Region)" name="FSResetCameraOnTP" tool_tip="Normalerweise wird die Kameraposition beim Teleportieren zurückgesetzt. Diese Option verhindert dieses Verhalten."/>
+			<check_box label="Kameraposition bei Avatarbewegung zurücksetzen" name="FSResetCameraOnMovement"/>
+			<check_box label="Minimale Zoomdistanz der Kamera aufheben" name="disableminzoomdist" tool_tip="Deaktiviert die minimale Zoomdistanz der Kamera zu einem Objekt."/>
+			<check_box label="Beim Zurücksetzen der Ansicht Avatar in Blickrichtung der Kamera drehen" name="resetviewturnsavatar" tool_tip="Behält die Blickrichtung der Kamera bei und dreht den Avatar, wenn die Ansicht zurückgesetzt wird (Beim Drücken von ESC)."/>
+			<check_box label="Kamerabewegung durch primitive Objekte erlauben" name="ignorecameraconstraints" tool_tip="Ignoriert die Beschränkung, dass die Kamera nicht durch primitive Objekte bewegt werden kann."/>
+			<text name="ignorecameraconstraints_requires_restart">
+				(Erfordert Neustart)
+			</text>
+			<check_box label="Kamera-Kontrollen auf undurchsichtigem Hintergrund anzeigen" name="FSAlwaysOpaqueCameraControls"/>
+			<check_box label="Info anzeigen, wenn sich der Simulator-Kanal beim Regionswechsel ändert" name="FSShowServerVersionChangeNotice" tool_tip="Zeigt an, falls sich beim einem Wechsel der Region oder durch einen Teleport die Version des Simulators ändert, auf dem die Region läuft."/>
+			<check_box label="Simulator-Kanal in der Statusleiste anzeigen" name="FSStatusbarShowSimulatorVersion" tool_tip="Zeigt den Kanal des Simulators an, auf dem die aktuelle Region läuft."/>
+		</panel>
+
+		<!--Mouselook-->
+		<panel label="Mouselook" name="tab-mouselook">
 			<check_box label="Mouselook-Funktionalität aktivieren" name="EnableMouselook" tool_tip="Aktiviert die Ego-Perspektive und -Steuerung mit der Maus."/>
 			<check_box label="Mich im Mouselook anzeigen" name="first_person_avatar_visible"/>
 			<check_box label="Benutzerinterface im Mouselook anzeigen" name="first_person_ui_visible"/>
@@ -30,7 +46,7 @@
 			</text>
 			<check_box label="Umkehren" name="invert_mouse"/>
 		</panel>
-		
+
 		<!--Movement-->
 		<panel label="Bewegung" name="tab-movement">
 			<check_box label="Mit Pfeiltasten bewegen" name="arrow_keys_move_avatar_check"/>
@@ -44,6 +60,8 @@
 			<check_box label="Warten auf Vor-Sprung- und Lande-Animationen deaktivieren" name="FSIgnoreFinishAnimation"/>
 			<check_box label="Soundeffekte beim Teleportieren abspielen" name="PlayTeleportSound"/>
 			<check_box label="Nach einem Teleport immer fliegen" name="FSFlyAfterTeleport"/>
+			<check_box label="Avatar umdrehen beim Rückwärtsgehen" name="backwardsturnavatar" tool_tip="Dreht den Avatar mit dem Gesicht zur Kamera beim Rückwärtsgehen."/>
+			<check_box label="Avatar zum ausgewählten Objekt drehen" name="FSTurnAvatarToSelectedObject" tool_tip="Dreht den Avatar mit dem Gesicht zum aktuell ausgewählten Objekt."/>
 			<text name="movelock_lbl">
 				Falls Movelock in der LSL-Brücke aktiviert ist...
 			</text>
@@ -67,21 +85,8 @@
 			<button label="Joystick-Konfiguration" name="joystick_setup_button"/>
 		</panel>
 
-		<!-- Firestorm -->
-		<panel label="Firestorm" name="tab-firestorm">
-			<text name="camera_options_label">
-			   Kamera-Optionen:
-			</text>
-			<check_box label="Klick auf Avatar hält Kameraposition" name="clickonavatarkeepscamera" tool_tip="Normalerweise wird die Kameraposition beim Anklicken des Avatars zurückgesetzt. Diese Option verhindert dieses Verhalten."/>
-			<check_box label="Kameraposition nach Teleport zurücksetzen (innerhalb einer Region)" name="FSResetCameraOnTP" tool_tip="Normalerweise wird die Kameraposition beim Teleportieren zurückgesetzt. Diese Option verhindert dieses Verhalten."/>
-			<check_box label="Kameraposition bei Avatarbewegung zurücksetzen" name="FSResetCameraOnMovement"/>
-			<check_box label="Minimale Zoomdistanz der Kamera aufheben" name="disableminzoomdist" tool_tip="Deaktiviert die minimale Zoomdistanz der Kamera zu einem Objekt."/>
-			<check_box label="Beim Zurücksetzen der Ansicht Avatar in Blickrichtung der Kamera drehen" name="resetviewturnsavatar" tool_tip="Behält die Blickrichtung der Kamera bei und dreht den Avatar, wenn die Ansicht zurückgesetzt wird (Beim Drücken von ESC)."/>
-			<check_box label="Kamerabewegung durch primitive Objekte erlauben" name="ignorecameraconstraints" tool_tip="Ignoriert die Beschränkung, dass die Kamera nicht durch primitive Objekte bewegt werden kann."/>
-			<text name="ignorecameraconstraints_requires_restart">
-				(Erfordert Neustart)
-			</text>
-			<check_box label="Kamera-Kontrollen auf undurchsichtigem Hintergrund anzeigen" name="FSAlwaysOpaqueCameraControls"/>
+		<!-- Map & Minimap -->
+		<panel label="Weltkarte &amp; Minikarte" name="tab-maps">
 			<text name="minimap_options_label">
 			   Minikarte-Optionen:
 			</text>
@@ -101,10 +106,6 @@
 			<check_box label="Doppelte Landmarken auf der Weltkarte filtern" name="WorldmapFilterDuplicateLandmarks" tool_tip="Filtert doppelte (identische) Landmarken in der Übersicht der Landmarken auf der Weltkarte."/>
 			<check_box label="Erweiterte Regionsinformationen auf der Weltkarte anzeigen" name="FSAdvancedWorldmapRegionInfo" tool_tip="Zeigt erweiterte Regionsinformationen (Anzahl Avatare und Alterseinstufung) auf der Weltkarte an."/>
 			<check_box label="Grid-Koordinaten auf der Weltkarte anzeigen" name="FSShowRegionGridCoordinates" tool_tip="Zeigt die Gridkoordinaten (mit Region als Einheit) auf der Weltkarte an."/>
-			<check_box label="Info anzeigen, wenn sich der Simulator-Kanal beim Regionswechsel ändert" name="FSShowServerVersionChangeNotice" tool_tip="Zeigt an, falls sich beim einem Wechsel der Region oder durch einen Teleport die Version des Simulators ändert, auf dem die Region läuft."/>
-			<check_box label="Simulator-Kanal in der Statusleiste anzeigen" name="FSStatusbarShowSimulatorVersion" tool_tip="Zeigt den Kanal des Simulators an, auf dem die aktuelle Region läuft."/>
-			<check_box label="Avatar umdrehen beim Rückwärtsgehen" name="backwardsturnavatar" tool_tip="Dreht den Avatar mit dem Gesicht zur Kamera beim Rückwärtsgehen."/>
-			<check_box label="Avatar zum ausgewählten Objekt drehen" name="FSTurnAvatarToSelectedObject" tool_tip="Dreht den Avatar mit dem Gesicht zum aktuell ausgewählten Objekt."/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 49c31494ae..e690dfaf19 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -19,7 +19,7 @@
  right="-1"
  name="tabs"
  tab_min_width="50"
- tab_position="top" >
+ tab_position="top">
 
     <!--View-->
     <panel
@@ -29,7 +29,7 @@
      right="-1"
      follows="all"
      label="View"
-     name="tab-view" >
+     name="tab-view">
         <icon
          follows="left|top"
          height="18"
@@ -39,7 +39,7 @@
          mouse_opaque="false"
          visible="true"
          width="18"
-         left="30"
+         left="20"
          top="10"/>
         <slider
          can_edit_text="true"
@@ -52,7 +52,7 @@
          layout="topleft"
          label_width="100"
          label="View angle"
-         left_pad="30"
+         left_pad="20"
          max_val="2.97"
          min_val="0.17"
          name="camera_fov"
@@ -121,7 +121,7 @@
          left_delta="0"
          name="DisableCameraConstraints"
          tool_tip="Set this to move your camera beyond its normal bounds and below land level. If you are not good at moving the camera, more of your shots may be at bad angles."
-         top_pad="7"
+         top_pad="10"
          width="315"/>
         <check_box
          control_name="FSDisableMouseWheelCameraZoom"
@@ -139,7 +139,7 @@
          left="80"
          name="heading2"
          width="300"
-         top_pad="5">
+         top_pad="10">
          Automatically pose avatar during (select one or more):
         </text>
         <check_box
@@ -168,10 +168,137 @@
          height="16"
          label="Add Additional Lighting"
          layout="topleft"
-		 left_pad="10"
+         left_pad="10"
          name="EditAppearanceLighting"
          tool_tip="Enable or disable the additional lighting used while editing avatar appearance."
          width="150" />
+
+        <check_box
+         top_pad="10"
+         follows="left|top"
+         height="16"
+         initial_value="false"
+         label="Clicking your avatar keeps camera position"
+         layout="topleft"
+         left="20"
+         name="clickonavatarkeepscamera"
+         width="270"
+         control_name="ClickOnAvatarKeepsCamera"
+         tool_tip="Normally, clicking on your avatar resets the camera position. This option removes this behavior."/>
+        <check_box
+         top_pad="4"
+         follows="left|top"
+         height="16"
+         initial_value="false"
+         label="Reset camera position after teleport (within a region)"
+         layout="topleft"
+         left="20"
+         name="FSResetCameraOnTP"
+         width="270"
+         control_name="FSResetCameraOnTP"
+         tool_tip="Normally, the camera position gets reset when teleporting. This option prevents this behavior."/>
+        <check_box
+         top_pad="4"
+         follows="left|top"
+         height="16"
+         label="Reset camera position on avatar movement"
+         layout="topleft"
+         left="20"
+         name="FSResetCameraOnMovement"
+         width="270"
+         control_name="FSResetCameraOnMovement"/>
+        <check_box
+         top_pad="4"
+         follows="left|top"
+         height="16"
+         initial_value="false"
+         label="Disable minimum camera zoom distance"
+         layout="topleft"
+         left="20"
+         name="disableminzoomdist"
+         width="350"
+         control_name="FSDisableMinZoomDist"
+         tool_tip="Disable the constraint on the closest distance the camera is allowed to get to an object."/>
+        <check_box
+         top_pad="4"
+         follows="left|top"
+         height="16"
+         initial_value="false"
+         label="Turn avatar towards camera direction on reset view"
+         layout="topleft"
+         left="20"
+         name="resetviewturnsavatar"
+         width="350"
+         control_name="ResetViewTurnsAvatar"
+         tool_tip="This option keeps the camera direction and turns the avatar when Reset View is selected (hit ESC key)."/>
+        <check_box
+         top_pad="4"
+         follows="left|top"
+         height="16"
+         initial_value="false"
+         label="Allow the camera to move without constraints through prims"
+         layout="topleft"
+         left="20"
+         name="ignorecameraconstraints"
+         width="350"
+         control_name="FSIgnoreSimulatorCameraConstraints"
+         tool_tip="Ignores the 'push' the simulator applies to your camera to keep it out of objects."/>
+        <text
+         name="ignorecameraconstraints_requires_restart"
+         follows="left|top"
+         layout="topleft"
+         left_pad="10"
+         top_delta="0"
+         height="20"
+         width="130"
+         text_color="White_25">
+            (requires restart)
+        </text>
+        <check_box
+         top_pad="0"
+         follows="left|top"
+         height="16"
+         label="Show the default camera controls minifloater always as opaque"
+         layout="topleft"
+         left="20"
+         name="FSAlwaysOpaqueCameraControls"
+         width="350"
+         control_name="FSAlwaysOpaqueCameraControls"/>
+
+        <check_box
+         top_pad="10"
+         follows="left|top"
+         height="16"
+         initial_value="false"
+         label="Notify if the simulator version changes while changing the region"
+         left="15"
+         name="FSShowServerVersionChangeNotice"
+         width="270"
+         control_name="FSShowServerVersionChangeNotice"
+         tool_tip="Displays a notice if the simulator version changes during a teleport or while crossing a region."/>
+
+        <check_box
+         top_pad="5"
+         follows="left|top"
+         height="16"
+         initial_value="false"
+         label="Show simulator channel in status bar"
+         name="FSStatusbarShowSimulatorVersion"
+         width="270"
+         control_name="FSStatusbarShowSimulatorVersion"
+         tool_tip="Shows the current simulator channel in the V1-like status bar."/>
+
+	</panel>
+
+    <!--Mouselook-->
+    <panel
+     top_pad="5"
+     bottom="-1"
+     left="1"
+     right="-1"
+     follows="all"
+     label="Mouselook"
+     name="tab-mouselook">
         <icon
          follows="left|top"
          height="18"
@@ -181,8 +308,8 @@
          mouse_opaque="false"
          visible="true"
          width="18"
-         top_pad="6"
-         left="30" />
+         top="10"
+         left="20" />
         <check_box
          control_name="EnableMouselook"
          follows="top"
@@ -190,7 +317,7 @@
          initial_value="true"
          label="Enable Mouselook functionality"
          layout="topleft"
-         left_pad="30"
+         left_pad="20"
          name="EnableMouselook"
          tool_tip="Allow first person perspective and mouse control of camera"
          width="256" />
@@ -202,7 +329,7 @@
          label="Show avatar in Mouselook"
          layout="topleft"
          left_delta="10"
-         top_pad="2"
+         top_pad="8"
          name="first_person_avatar_visible"
          width="256" />
         <check_box
@@ -213,7 +340,7 @@
          label="Show user interface in Mouselook"
          layout="topleft"
          name="first_person_ui_visible"
-         top_pad="2"
+         top_pad="5"
          width="256" />
         <check_box
          control_name="FSEnableRightclickMenuInMouselook"
@@ -224,7 +351,7 @@
          layout="topleft"
          name="FSEnableRightclickMenuInMouselook"
          tool_tip="Opens pie/context menu in mouselook mode upon ALT + right mouse button"
-         top_pad="2"
+         top_pad="5"
          width="256" />
         <check_box
          control_name="FSScrollWheelExitsMouselook"
@@ -236,7 +363,7 @@
          layout="topleft"
          name="FSScrollWheelExitsMouselook"
          tool_tip="If enabled, turning the scroll wheel on the mouse will exit Mouselook"
-         top_pad="2"
+         top_pad="5"
          width="256" />
         <check_box
          control_name="FSShowMouselookInstructions"
@@ -248,7 +375,7 @@
          layout="topleft"
          name="mouselook_instructions_visible"
          tool_tip="Show Mouselook Instructions"
-         top_pad="2"
+         top_pad="5"
          width="256" />
         <check_box
          control_name="ShowCrosshairs"
@@ -260,7 +387,7 @@
          layout="topleft"
          name="ShowCrosshairs"
          tool_tip="Display crosshairs when in mouselook mode"
-         top_pad="2"
+         top_pad="5"
          width="256" />
         <check_box
          control_name="FSMouselookCombatFeatures"
@@ -270,7 +397,7 @@
          label="Enable combat features"
          layout="topleft"
          name="FSMouselookCombatFeatures"
-         top_pad="2"
+         top_pad="5"
          width="256" />
         <check_box
          control_name="ExodusMouselookIFF"
@@ -280,7 +407,7 @@
          layout="topleft"
          left_delta="10"
          name="ExodusMouselookIFF"
-         top_pad="2"
+         top_pad="5"
          width="256" />
         <slider
          control_name="ExodusMouselookIFFRange"
@@ -296,7 +423,7 @@
          left_delta="5"
          max_val="500"
          name="ExodusMouselookIFFRange"
-         top_pad="2"
+         top_pad="5"
          width="333" />
         <text
          type="string"
@@ -306,7 +433,7 @@
          layout="topleft"
          left_delta="-10"
          name="Mouse Sensitivity"
-         top_pad="7"
+         top_pad="10"
          width="160">
          Mouselook mouse sensitivity:
         </text>
@@ -321,7 +448,7 @@
          left_pad="5"
          max_val="15"
          name="mouse_sensitivity"
-         top_delta="-1"
+         top_delta="1"
          width="145" />
         <check_box
          control_name="InvertMouse"
@@ -343,7 +470,7 @@
      right="-1"
      follows="all"
      label="Movement"
-     name="tab-movement" >
+     name="tab-movement">
         <check_box
          control_name="ArrowKeysAlwaysMove"
          follows="left|top"
@@ -353,7 +480,7 @@
          left_delta="10"
          name="arrow_keys_move_avatar_check"
          width="237"
-         top_pad="2"/>
+         top_pad="8"/>
         <check_box
          control_name="FSUseAzertyKeyboardLayout"
          follows="left|top"
@@ -435,6 +562,22 @@
          name="FSFlyAfterTeleport"
          width="237"
          top_pad="0"/>
+        <check_box top_pad="0"
+         follows="left|top"
+         height="20"
+         label="Turn avatar around when walking backwards"
+         name="backwardsturnavatar"
+         width="270"
+         control_name="TurnAroundWhenWalkingBackwards"
+         tool_tip="Turns your avatar around to face the camera when you are walking backwards."/>
+        <check_box top_pad="0"
+         follows="left|top"
+         height="20"
+         label="Turn avatar towards a selected object"
+         name="FSTurnAvatarToSelectedObject"
+         width="270"
+         control_name="FSTurnAvatarToSelectedObject"
+         tool_tip="Turns your avatar around to face the object you are currently selecting."/>
         <text
          follows="left|top"
          type="string"
@@ -548,129 +691,18 @@
         </button>
     </panel>
     
-    <!-- Firestorm -->
+    <!-- Map & Minimap -->
     <panel
      top_pad="5"
      bottom="-1"
      left="1"
      right="-1"
      follows="all"
-     label="Firestorm"
-     name="tab-firestorm" >
-        <text
-         top_pad="5"
-         type="string"
-         length="1"
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left="15"
-         name="camera_options_label"
-         width="200">
-           Camera options:
-        </text>
-
-        <check_box
-         top_pad="4"
-         follows="left|top"
-         height="16"
-         initial_value="false"
-         label="Clicking your avatar keeps camera position"
-         layout="topleft"
-         left="30"
-         name="clickonavatarkeepscamera"
-         width="270"
-         control_name="ClickOnAvatarKeepsCamera"
-         tool_tip="Normally, clicking on your avatar resets the camera position. This option removes this behavior."/>
-
-        <check_box
-         top_pad="4"
-         follows="left|top"
-         height="16"
-         initial_value="false"
-         label="Reset camera position after teleport (within a region)"
-         layout="topleft"
-         left="30"
-         name="FSResetCameraOnTP"
-         width="270"
-         control_name="FSResetCameraOnTP"
-         tool_tip="Normally, the camera position gets reset when teleporting. This option prevents this behavior."/>
-		 
-        <check_box
-         top_pad="4"
-         follows="left|top"
-         height="16"
-         label="Reset camera position on avatar movement"
-         layout="topleft"
-         left="30"
-         name="FSResetCameraOnMovement"
-         width="270"
-         control_name="FSResetCameraOnMovement"/>
-
-		<check_box
-         top_pad="4"
-         follows="left|top"
-         height="16"
-         initial_value="false"
-         label="Disable minimum camera zoom distance"
-         layout="topleft"
-         left="30"
-         name="disableminzoomdist"
-         width="350"
-         control_name="FSDisableMinZoomDist"
-         tool_tip="Disable the constraint on the closest distance the camera is allowed to get to an object."/>
-
-        <check_box
-         top_pad="4"
-         follows="left|top"
-         height="16"
-         initial_value="false"
-         label="Turn avatar towards camera direction on reset view"
-         layout="topleft"
-         left="30"
-         name="resetviewturnsavatar"
-         width="350"
-         control_name="ResetViewTurnsAvatar"
-         tool_tip="This option keeps the camera direction and turns the avatar when Reset View is selected (hit ESC key)."/>
-
-        <check_box
-         top_pad="4"
-         follows="left|top"
-         height="16"
-         initial_value="false"
-         label="Allow the camera to move without constraints through prims"
-         layout="topleft"
-         left="30"
-         name="ignorecameraconstraints"
-         width="350"
-         control_name="FSIgnoreSimulatorCameraConstraints"
-         tool_tip="Ignores the 'push' the simulator applies to your camera to keep it out of objects."/>
+     label="Map &amp; Minimap"
+     name="tab-maps">
 
         <text
-         name="ignorecameraconstraints_requires_restart"
-         follows="left|top"
-         layout="topleft"
-         left_pad="10"
-         top_delta="0"
-         height="20"
-         width="130"
-         text_color="White_25">
-            (requires restart)
-        </text>
-
-        <check_box
-         top_pad="0"
-         follows="left|top"
-         height="16"
-         label="Show the default camera controls minifloater always as opaque"
-         layout="topleft"
-         left="30"
-         name="FSAlwaysOpaqueCameraControls"
-         width="350"
-         control_name="FSAlwaysOpaqueCameraControls"/>
-
-        <text
-         top_pad="4"
+         top_pad="10"
          type="string"
          length="1"
          follows="left|top"
@@ -683,7 +715,7 @@
         </text>
 
         <check_box
-         top_pad="4"
+         top_pad="10"
          follows="left|top"
          height="16"
          initial_value="false"
@@ -750,7 +782,7 @@
          top_pad="5"/>
 
         <text
-         top_pad="4"
+         top_pad="10"
          type="string"
          length="1"
          follows="left|top"
@@ -762,7 +794,7 @@
          World map options:
         </text>
         
-        <check_box top_pad="5"
+        <check_box top_pad="10"
          follows="left|top"
          height="16"
          initial_value="false"
@@ -793,44 +825,6 @@
          control_name="FSShowRegionGridCoordinates"
          tool_tip="Shows the grid coordinates (in units of regions) on the world map."/>
 
-        <check_box top_pad="5"
-         follows="left|top"
-         height="16"
-         initial_value="false"
-         label="Notify if the simulator version changes while changing the region"
-         left="15"
-         name="FSShowServerVersionChangeNotice"
-         width="270"
-         control_name="FSShowServerVersionChangeNotice"
-         tool_tip="Displays a notice if the simulator version changes during a teleport or while crossing a region."/>
-
-        <check_box top_pad="5"
-         follows="left|top"
-         height="16"
-         initial_value="false"
-         label="Show simulator channel in status bar"
-         name="FSStatusbarShowSimulatorVersion"
-         width="270"
-         control_name="FSStatusbarShowSimulatorVersion"
-         tool_tip="Shows the current simulator channel in the V1-like status bar."/>
-        
-        <check_box top_pad="5"
-         follows="left|top"
-         height="16"
-         label="Turn avatar around when walking backwards"
-         name="backwardsturnavatar"
-         width="270"
-         control_name="TurnAroundWhenWalkingBackwards"
-         tool_tip="Turns your avatar around to face the camera when you are walking backwards."/>
-        
-        <check_box top_pad="5"
-         follows="left|top"
-         height="16"
-         label="Turn avatar towards a selected object"
-         name="FSTurnAvatarToSelectedObject"
-         width="270"
-         control_name="FSTurnAvatarToSelectedObject"
-         tool_tip="Turns your avatar around to face the object you are currently selecting."/>
 	 </panel>
 </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_move.xml b/indra/newview/skins/default/xui/es/panel_preferences_move.xml
index a124ee911a..6c5937ec60 100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_move.xml
@@ -14,10 +14,24 @@
 			<check_box label="Construir/Editar" name="edit_camera_movement" tool_tip="Usar posicionamiento automático de cámara cuando se entra o sale del modo de edición de objetos"/>
 			<check_box label="Editar apariencia" name="appearance_camera_movement" tool_tip="Usar posicionamiento automático de cámara cuando se entra o sale del modo de edición de la apariencia o vestuario" width="115"/>
 			<check_box label="Añadir iluminación adicional" name="EditAppearanceLighting" tool_tip="Activa o desactiva la iluminación adicional mientras se edita la apariencia del avatar."/>
+			<check_box label="Hacer clic en mi avatar mantiene la posición de la cámara" name="clickonavatarkeepscamera" tool_tip="Normalmente, hacer clic en tu avatar restablece la posición de la cámara. Esta configuración evita ese comportamiento."/>
+			<check_box label="Restablecer posición de la cámara al mover el avatar" name="FSResetCameraOnMovement"/>
+			<check_box label="Restablecer posición de la cámara tras teleportarme (en la misma región)" name="FSResetCameraOnTP" tool_tip="Normalmente, la posición de la cámara se restablece cuando te teleportas. Esta opción evita ese comportamiento."/>
+			<check_box label="Desactivar la distancia mínima de zoom" name="disableminzoomdist" tool_tip="Desactiva el límite de cercanía de la cámara a un objeto o avatar."/>
+			<check_box label="Orientar avatar hacia la dirección de la cámara al restablecer la vista" name="resetviewturnsavatar" tool_tip="Esta opción mantiene la dirección de la cámara y orienta al avatar cuando se restablece la vista (al pulsar la tecla ESC)."/>
+			<check_box label="Permitir a la cámara moverse a través de objetos" name="ignorecameraconstraints" tool_tip="Ignora el 'empujón' que el simulador aplica a tu cámara para mantenerla fuera de los objetos." width="285"/>
+			<text name="ignorecameraconstraints_requires_restart" top_pad="-2" top_delta="-1">
+				(requiere reiniciar)
+			</text>
+			<check_box label="Muestra los controles de cámara por defecto siempre opacos" name="FSAlwaysOpaqueCameraControls"/>
+			<check_box label="Notificar los cambios de versión de simulador al cambiar de región" name="FSShowServerVersionChangeNotice" tool_tip="Muestra un aviso si la versión de simulador cambia durante un teleporte o al cruzar a otra región."/>
+			<check_box label="Mostrar canal del simulador en la barra de estado" name="FSStatusbarShowSimulatorVersion" tool_tip="Muestra el canal del simulador actual en la barra de estado estilo V1."/>
+		</panel>
+		<panel label="Vista subjetiva" name="tab-mouselook">
 			<check_box label="Activar la funcionalidad de vista subjetiva" name="EnableMouselook" tool_tip="Permite una perspectiva de primera persona y el contról de la cámara con el ratón"/>
 			<check_box label="Mostrar mi avatar en vista subjetiva" name="first_person_avatar_visible"/>
 			<check_box label="Mostrar interfaz de usuario en vista subjetiva" name="first_person_ui_visible"/>
-			<check_box label="Activa menús contextuales en vista sujetiva" name="FSEnableRightclickMenuInMouselook" tool_tip="En modo de vista subjetiva, ALT + botón derecho del ratón abritá el menú contextual/tarta"/>
+			<check_box label="Activa menús contextuales en vista subjetiva" name="FSEnableRightclickMenuInMouselook" tool_tip="En modo de vista subjetiva, ALT + botón derecho del ratón abritá el menú contextual/tarta"/>
 			<check_box label="Mostrar instrucciones de vista subjetiva" name="mouselook_instructions_visible" tool_tip=""/>
 			<check_box label="Mostrar puntos de mira en vista subjetiva" name="ShowCrosshairs" tool_tip="Muestra los puntos de mira cuando te encuentras en vista subjetiva"/>
 			<text name="Mouse Sensitivity" width="220">
@@ -31,11 +45,12 @@
 			<text name="FSUseAzertyKeyboardLayout_requires_restart">
 				(requiere reiniciar)
 			</text>
-			<check_box label="Pulsar-pulsar-mantener para correr" name="tap_tap_hold_to_run"/>
+			<check_box label="Pulsar-pulsar-mantener para correr" name="tap_tap_hold_to_run" left_delta="-220"/>
 			<check_box label="Volar/aterrizar al mantener arriba/abajo" name="automatic_fly"/>
 			<check_box label="Activar el modo conmutado para agacharse" name="crouch_toggle_mode"/>
 			<check_box label="Reproducir efecto de sonido al teleportarme" name="PlayTeleportSound"/>
 			<check_box label="Iniciar siempre el vuelo después de teleportarme" name="FSFlyAfterTeleport"/>
+			<check_box label="Hacer girar al avatar cuando camina hacia atrás" name="backwardsturnavatar" tool_tip="Gira el avatar para encarar la cámara cuando lo haces caminar hacia atrás"/>
 			<check_box label="Si movelock está activado, volver a bloquear tras cambiar de región" name="RelockMoveLockAfterRegionChange"/>
 			<text name="single_click_action_lbl">
 				Un solo clic en el terreno:
@@ -54,20 +69,7 @@
 			</combo_box>
 			<button label="Configuración del Joystick" name="joystick_setup_button" width="160"/>
 		</panel>
-		<panel label="Firestorm" name="tab-firestorm">
-			<text name="camera_options_label">
-				Opciones de cámara:
-			</text>
-			<check_box label="Hacer clic en mi avatar mantiene la posición de la cámara" name="clickonavatarkeepscamera" tool_tip="Normalmente, hacer clic en tu avatar restablece la posición de la cámara. Esta configuración evita ese comportamiento."/>
-			<check_box label="Restablecer posición de la cámara al mover el avatar" name="FSResetCameraOnMovement"/>
-			<check_box label="Restablecer posición de la cámara tras teleportarme (en la misma región)" name="FSResetCameraOnTP" tool_tip="Normalmente, la posición de la cámara se restablece cuando te teleportas. Esta opción evita ese comportamiento."/>
-			<check_box label="Desactivar la distancia mínima de zoom" name="disableminzoomdist" tool_tip="Desactiva el límite de cercanía de la cámara a un objeto o avatar."/>
-			<check_box label="Orientar avatar hacia la dirección de la cámara al restablecer la vista" name="resetviewturnsavatar" tool_tip="Esta opción mantiene la dirección de la cámara y orienta al avatar cuando se restablece la vista (al pulsar la tecla ESC)."/>
-			<check_box label="Permitir a la cámara moverse a través de objetos" name="ignorecameraconstraints" tool_tip="Ignora el 'empujón' que el simulador aplica a tu cámara para mantenerla fuera de los objetos." width="285"/>
-			<text name="ignorecameraconstraints_requires_restart" top_pad="-2" top_delta="-1">
-				(requiere reiniciar)
-			</text>
-			<check_box label="Muestra los controles de cámara por defecto siempre opacos" name="FSAlwaysOpaqueCameraControls"/>
+		<panel label="Mapa mundial &amp; minimapa" name="tab-maps">
 			<text name="minimap_options_label">
 				Opciones del minimapa:
 			</text>
@@ -86,9 +88,6 @@
 			<check_box top_pad="5" label="Filtrar hitos duplicados en el mapa mundial" name="WorldmapFilterDuplicateLandmarks" tool_tip="Filtra las entradas de hitos en la lista de hitos del mapa mundial"/>
 			<check_box label="Mostrar informacion adicional de la región en el Mapa Mundial" name="FSAdvancedWorldmapRegionInfo" tool_tip="Muestra informaciones adicionales en el mapa del mundo (número de avatares y calificación de contenidos)."/>
 			<check_box top_pad="5" label="Mostrar coordenadas de la red en el mapa mundial." name="FSShowRegionGridCoordinates" tool_tip="Muestra las coordinadas de la red (en unidades de región) en el mapa mundial."/>
-			<check_box label="Notificar los cambios de versión de simulador al cambiar de región" name="FSShowServerVersionChangeNotice" tool_tip="Muestra un aviso si la versión de simulador cambia durante un teleporte o al cruzar a otra región."/>
-			<check_box label="Mostrar canal del simulador en la barra de estado" name="FSStatusbarShowSimulatorVersion" tool_tip="Muestra el canal del simulador actual en la barra de estado estilo V1."/>
-			<check_box label="Hacer girar al avatar cuando camina hacia atrás" name="backwardsturnavatar" tool_tip="Gira el avatar para encarar la cámara cuando lo haces caminar hacia atrás"/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml
index f9a6021881..c194ea023c 100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml
@@ -11,6 +11,9 @@
 			<check_box label="Construire/Modifier" name="edit_camera_movement" tool_tip="Utiliser le positionnement automatique de la caméra lorsque vous entrez en mode de modification et le quittez."/>
 			<check_box label="Apparence" name="appearance_camera_movement" tool_tip="Utiliser le positionnement automatique de la caméra en mode de modification."/>
 			<check_box initial_value="true" label="Panneau latéral" name="appearance_sidebar_positioning" tool_tip="Utiliser le positionnement automatique de la caméra pour le panneau latéral."/>
+		</panel>
+		<!--Mouselook-->
+		<panel name="tab-mouselook">
 			<check_box label="Afficher en vue subjective" name="first_person_avatar_visible"/>
 			<text name="Mouse Sensitivity">
 				Sensibilité de la souris en vue subjective :
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_move.xml b/indra/newview/skins/default/xui/it/panel_preferences_move.xml
index dfda586430..260d3ffca0 100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_move.xml
@@ -13,7 +13,18 @@
 			</text>
 			<check_box label="Costruire/Modificare" name="edit_camera_movement" tool_tip="Utilizza il posizionamento automatico della fotocamera entrando o uscendo dalla modalità modifica"/>
 			<check_box label="Aspetto fisico" name="appearance_camera_movement" tool_tip="Utilizza il posizionamento automatico della camera in modalità modifica"/>
-			<check_box label="Aggiungi luminosità" name="EditAppearanceLighting" tool_tip="Quando si entra in Apparence verrà aggiunta una luce sull'avatar (Viewer 1.x style)"/>
+			<check_box label="Aggiungi luminosità" name="EditAppearanceLighting" tool_tip="Quando si entra in Apparence verrà aggiunta una luce sull'avatar (Viewer 1.x style)"/>			
+			<check_box label="Cliccando il tuo avatar mantiene la posizione della telecamera" name="clickonavatarkeepscamera" tool_tip="Normalmente, cliccando sul tuo avatar la posizione della camera si resetta, spuntando questa opzione, si annulla tale effetto."/>
+			<check_box label="Ripristina posizione della telecamera dopo teleport (Dentro la stessa sim)" name="FSResetCameraOnTP" tool_tip="Normalmente, la posizione della cam viene resettata quando ci si teletrasporta, spuntando questa opzione, si annulla tale effetto."/>
+			<check_box label="Disabilita limite di zoom della telecamera" name="disableminzoomdist" tool_tip="Disabilita il limite di zoom nell'avvicinarsi ad un'oggetto"/>
+			<check_box label="Gira l'avatar dove puntava la cam quando la resetti" name="resetviewturnsavatar" tool_tip="Mantiene la linea di vista della fotocamera e ruota l'avatar, se la visuale viene resettata (quando premi ESC)."/>
+			<check_box label="Consente alla cam di spostarsi senza bloccarsi sui prim" name="ignorecameraconstraints" tool_tip="Ignora la 'spinta', che riceve la cam dal simulatore, quando ci si avvicina troppo ad un prim."/>
+			<text name="ignorecameraconstraints_requires_restart">
+				(Richiesto riavvio)
+			</text>
+		</panel>
+		<!--Mouselook-->
+		<panel name="tab-mouselook" label="Mouselook">
 			<check_box label="Mostra in modalità Mouselook" name="first_person_avatar_visible"/>
 			<check_box label="Mostra istruzioni Mouselook" name="mouselook_instructions_visible" tool_tip="Quando si entra in Mouselook verranno visualizzate le istruzioni come nel viewer 1.x"/>
 			<text name="Mouse Sensitivity" width="170">
@@ -32,6 +43,7 @@
 			<check_box label="Volare/Atterrare tenendo premuto Pag su/Pag giù" name="automatic_fly"/>
 			<check_box label="Riprodurre effetto sonoro quando si effettua il Teleport" name="PlayTeleportSound"/>
 			<check_box label="Vola sempre dopo il teleport" name="FSFlyAfterTeleport"/>
+			<check_box label="Girare l'avatar quando si cammina all'indietro" name="backwardsturnavatar" tool_tip="Gira l'avatar verso la telecamera quando cammini all'indietro"/>
 			<text name="single_click_action_lbl">
 				Click singolo a terra:
 			</text>
@@ -49,19 +61,8 @@
 			</combo_box>
 			<button label="Altri dispositivi" name="joystick_setup_button"/>
 		</panel>
-		<!--Firestorm-->
-		<panel name="tab-firestorm">
-			<text name="camera_options_label">
-				Opzioni camera:
-			</text>
-			<check_box label="Cliccando il tuo avatar mantiene la posizione della telecamera" name="clickonavatarkeepscamera" tool_tip="Normalmente, cliccando sul tuo avatar la posizione della camera si resetta, spuntando questa opzione, si annulla tale effetto."/>
-			<check_box label="Ripristina posizione della telecamera dopo teleport (Dentro la stessa sim)" name="FSResetCameraOnTP" tool_tip="Normalmente, la posizione della cam viene resettata quando ci si teletrasporta, spuntando questa opzione, si annulla tale effetto."/>
-			<check_box label="Disabilita limite di zoom della telecamera" name="disableminzoomdist" tool_tip="Disabilita il limite di zoom nell'avvicinarsi ad un'oggetto"/>
-			<check_box label="Gira l'avatar dove puntava la cam quando la resetti" name="resetviewturnsavatar" tool_tip="Mantiene la linea di vista della fotocamera e ruota l'avatar, se la visuale viene resettata (quando premi ESC)."/>
-			<check_box label="Consente alla cam di spostarsi senza bloccarsi sui prim" name="ignorecameraconstraints" tool_tip="Ignora la 'spinta', che riceve la cam dal simulatore, quando ci si avvicina troppo ad un prim."/>
-			<text name="ignorecameraconstraints_requires_restart">
-				(Richiesto riavvio)
-			</text>
+		<!--Maps-->
+		<panel label="World Map &amp; Minimappa" name="tab-maps">
 			<check_box label="Abilita rotazione Minimappa" name="minimaprotate" tool_tip="Rotazione della minimappa quando fate girare il vostro avatar"/>
 			<check_box name="MiniMapChatRing" label="Visualizza il raggio della local chat sulla minimappa"/>
 			<text name="netmap_double_click_action_lbl" width="170">
@@ -72,7 +73,6 @@
 				<combo_box.item label="Apri la mappa" name="1"/>
 				<combo_box.item label="Teleport al punto cliccato" name="2"/>
 			</combo_box>
-			<check_box label="Girare l'avatar quando si cammina all'indietro" name="backwardsturnavatar" tool_tip="Gira l'avatar verso la telecamera quando cammini all'indietro"/>
 			<check_box label="Filtra i Landmarks sulla World Map" name="WorldmapFilterDuplicateLandmarks" tool_tip="Filtra i Lanmarks doppi quando si effettua la visualizzazione del posto dalla World Map"/>
 			<check_box label="Mostra ulteriori informazioni sulla regione nella Mappa del mondo" name="FSAdvancedWorldmapRegionInfo" tool_tip="Mostra informazioni aggiuntive sulla Mappa del mondo(Numero degli avatar in sim e livello di accesso)."/>
 		</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
index 9afe5863ff..33619bee4f 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
@@ -21,6 +21,23 @@
 			<!-- Deleted Aug.21, 2012
 			<check_box initial_value="true" label="サイドバー" name="appearance_sidebar_positioning" tool_tip="サイドバーに自動カメラポジションを使います"/>
 			-->
+			<check_box label="アバターをクリックしてもカメラの位置を変更しない" name="clickonavatarkeepscamera" tool_tip="通常、アバターをクリックするとカメラの位置がリセットされます。このオプションはこの動作を回避します。"/>
+			<check_box label="（同じSIM内で）テレポートした後のカメラの位置を元に戻す" name="FSResetCameraOnTP" tool_tip="通常、テレポートする時にカメラの位置がリセットされます。このオプションはこの動作を回避します。"/>
+			<check_box label="アバターが動く時にカメラの位置を元に戻す" name="FSResetCameraOnMovement" />
+			<check_box label="至近距離の制限を解除" name="disableminzoomdist" tool_tip="オブジェクトにカメラが近づける距離には制限がありますが、この制限を解除して近づけます。"/>
+			<check_box label="カメラリセット時にアバターを振り返らせる" name="resetviewturnsavatar" tool_tip="Escキーでカメラをリセットすると、アバターがカメラの方を向きます。"/>
+			<check_box label="プリムの向こう側が見えるようにカメラ移動の制限を解除" name="ignorecameraconstraints" tool_tip="通常はプリムにぶつかるとそれより先にカメラを進めることはできないが、この制限を解除してプリムの向こう側にカメラを回ることができます。"/>
+			<text name="ignorecameraconstraints_requires_restart">
+				（再起動が必要）
+			</text>
+			<check_box label="デフォルトのカメラコントロールのミニウィンドウを常に不透明で表示" name="FSAlwaysOpaqueCameraControls" />
+			<check_box label="地域間を移動する時、シミュレーターのバージョンが異なる場合に通知" name="FSShowServerVersionChangeNotice" tool_tip="テレポートしたり、SIMを地域をまたいで移動した場合に、シミュレーターのバージョンが異なるとその旨の通知を表示します。" />
+			<check_box label="シミュレーターのチャネルをステータスバーに表示" name="FSStatusbarShowSimulatorVersion" tool_tip="１系仕様のステータスバーにシミューレーターのチャネルを表示します。"/>
+		</panel>
+
+		<!--Mouselook-->
+
+		<panel label="マウスルック" name="tab-mouselook">
 			<check_box label="マウスルック機能を有効にする" name="EnableMouselook" tool_tip="一人称視点を可能にし、マウスでカメラをコントロールできるようにします。" />
 			<check_box label="一人称視点で表示する" name="first_person_avatar_visible"/>
 			<check_box label="マウスルックにユーザーインターフェイスを表示" name="first_person_ui_visible" />
@@ -32,21 +49,21 @@
 			</text>
 			<check_box label="切り替え" name="invert_mouse"/>
 		</panel>
-		
-		
+
 		<!--Movement-->
 		
 		<panel label="移動" name="tab-movement">
 			<check_box label="常にキー操作で動くようにする" name="arrow_keys_move_avatar_check"/>
-			<check_box label="AZERTYキーボード配列（フランス式）を使用" name="FSUseAzertyKeyboardLayout" />
-			<text name="FSUseAzertyKeyboardLayout_requires_restart" left_pad ="60" width="80">
+			<check_box label="AZERTYキーボード配列（フランス式）を使用" name="FSUseAzertyKeyboardLayout" width="230" />
+			<text name="FSUseAzertyKeyboardLayout_requires_restart">
 				（再起動が必要）
 			</text>
-			<check_box label="上矢印キー2度押し+長押しで走る" name="tap_tap_hold_to_run"/>
+			<check_box label="上矢印キー2度押し+長押しで走る" name="tap_tap_hold_to_run" left_delta="-240"/>
 			<check_box label="UP/DOWNキーの長押しで飛行／着地する" name="automatic_fly" />
 			<check_box label="身をかがめる動作を有効にする" name="crouch_toggle_mode" />
 			<check_box label="テレポートサウンドを鳴らす" name="PlayTeleportSound" />
 			<check_box label="テレポート後は飛行状態のままにする" name="FSFlyAfterTeleport" />
+			<check_box label="後退する時に、アバターに正面を向いて歩かせるようにする" name="backwardsturnavatar" tool_tip="通常後退させると後ろ向きに歩きますが、正面を向いて歩くようにします。"/>
 			<text name="single_click_action_lbl">
 				地面をシングルクリック：
 			</text>
@@ -70,23 +87,9 @@
 		</panel>
 		
 		
-		<!-- Firestorm -->
+		<!-- Maps -->
 		
-		<panel label="Firestorm" name="tab-firestorm" >
-			<text name="camera_options_label">
-				カメラ・オプション
-			</text>
-
-			<check_box label="アバターをクリックしてもカメラの位置を変更しない" name="clickonavatarkeepscamera" tool_tip="通常、アバターをクリックするとカメラの位置がリセットされます。このオプションはこの動作を回避します。"/>
-			<check_box label="（同じSIM内で）テレポートした後のカメラの位置を元に戻す" name="FSResetCameraOnTP" tool_tip="通常、テレポートする時にカメラの位置がリセットされます。このオプションはこの動作を回避します。"/>
-			<check_box label="アバターが動く時にカメラの位置を元に戻す" name="FSResetCameraOnMovement" />
-			<check_box label="至近距離の制限を解除" name="disableminzoomdist" tool_tip="オブジェクトにカメラが近づける距離には制限がありますが、この制限を解除して近づけます。"/>
-			<check_box label="カメラリセット時にアバターを振り返らせる" name="resetviewturnsavatar" tool_tip="Escキーでカメラをリセットすると、アバターがカメラの方を向きます。"/>
-			<check_box label="プリムの向こう側が見えるようにカメラ移動の制限を解除" name="ignorecameraconstraints" tool_tip="通常はプリムにぶつかるとそれより先にカメラを進めることはできないが、この制限を解除してプリムの向こう側にカメラを回ることができます。"/>
-			<text name="ignorecameraconstraints_requires_restart">
-				（再起動が必要）
-			</text>
-			<check_box label="デフォルトのカメラコントロールのミニウィンドウを常に不透明で表示" name="FSAlwaysOpaqueCameraControls" />
+		<panel label="世界地図のオプション / ミニマップのオプション" name="tab-maps" >
 			<text name="minimap_options_label">
 				ミニマップのオプション:
 			</text>
@@ -109,9 +112,6 @@
 			<check_box label="世界地図上で同じランドマークをダブって表示しない" name="WorldmapFilterDuplicateLandmarks" tool_tip="世界地図のランドマークリストに、同じランドマークが何度も表示されないようにします。"/>
 			<check_box label="世界地図にその地域の追加情報を表示" name="FSAdvancedWorldmapRegionInfo" tool_tip="世界地図上にその地域の追加情報（現在のアバター数やレーティング・レベルなど）を表示します。"/>
 			<check_box label="世界地図にグリッド座標を表示" name="FSShowRegionGridCoordinates" tool_tip="世界地図上にグリッド座標を地域単位で表示します。" />
-			<check_box label="地域間を移動する時、シミュレーターのバージョンが異なる場合に通知" name="FSShowServerVersionChangeNotice" tool_tip="テレポートしたり、SIMを地域をまたいで移動した場合に、シミュレーターのバージョンが異なるとその旨の通知を表示します。" />
-			<check_box label="シミュレーターのチャネルをステータスバーに表示" name="FSStatusbarShowSimulatorVersion" tool_tip="１系仕様のステータスバーにシミューレーターのチャネルを表示します。"/>
-			<check_box label="後退する時に、アバターに正面を向いて歩かせるようにする" name="backwardsturnavatar" tool_tip="通常後退させると後ろ向きに歩きますが、正面を向いて歩くようにします。"/>
 		</panel>
 	 
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
index 94f350a8ed..2b18094c17 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
@@ -14,6 +14,20 @@
 			<check_box label="Budowanie/Edycja" name="edit_camera_movement" tool_tip="Używaj automatycznego pozycjonowania kamery podczas włączania i wyłączania trybu edycji."/>
 			<check_box label="Wygląd" name="appearance_camera_movement" tool_tip="Używaj automatycznego pozycjonowania kamery podczas trybu edycji wyglądu."/>
 			<check_box label="Dodawaj dodatkowe oświetlenie" name="EditAppearanceLighting" tool_tip="Włącz lub wyłącz dodatkowe oświetlenie, gdy edytujesz wygląd."/>
+			<check_box label="Nie resetuj kamery, gdy kliknę na swojego awatara" name="clickonavatarkeepscamera" tool_tip="Normalnie gdy klikniesz na swojego awatara pozycja kamery ulega zresetowaniu. Ta opcja usuwa to zachowanie."/>
+			<check_box label="Resetowanie pozycji kamery po teleportacji (wewnątrz regionu)" name="FSResetCameraOnTP" tool_tip="Normalnie pozycja kamery ulega zresetowaniu po teleportacji. Ta opcja zapobiega temu zachowaniu."/>
+			<check_box label="Resetowanie pozycji kamery przy poruszaniu się awatarem" name="FSResetCameraOnMovement"/>
+			<check_box label="Wyłącz minimalną odległość przybliżenia kamery" name="disableminzoomdist" tool_tip="Wyłącz ograniczenie w przybliżaniu obiektów."/>
+			<check_box label="Obracaj awatara w stronę patrzenia kamery podczas resetowania widoku" name="resetviewturnsavatar" tool_tip="Po zresetowaniu widoku (lub naciśnięciu klawisza ESC) kierunek patrzenia kamery zostaje zachowany, a awatar - obrócony w jego stronę."/>
+			<check_box label="Przenikanie kamery przez primy bez ograniczeń" name="ignorecameraconstraints" tool_tip="Ignoruje 'pchnięcie' stosowane przez symulator, aby utrzymać kamerę na zewnątrz obiektów."/>
+			<text name="ignorecameraconstraints_requires_restart">
+				(wymaga restartu)
+			</text>
+			<check_box label="Pokazuj standardowe, małe okienko sterowania kamerą zawsze jako nieprzezroczyste" name="FSAlwaysOpaqueCameraControls"/>
+			<check_box label="Powiadom, jeśli wersja symulatora ulegnie zmianie podczas zmiany regionu" name="FSShowServerVersionChangeNotice" tool_tip="Wyświetla powiadomienie, jeśli wersja symulatora ulegnie zmianie podczas teleportowania się lub przekraczania granicy regionu."/>
+			<check_box label="Pokazuj kanał symulatora w pasku statusu" name="FSStatusbarShowSimulatorVersion" tool_tip="Pokazuj obecny kanał symulatora na pasku statusu w stylu V1."/>
+		</panel>
+		<panel label="Widok pierwszoosobowy" name="tab-mouselook">
 			<check_box label="Włącz funkcjonalność widoku pierwszoosobowego" name="EnableMouselook" tool_tip="Zezwól przeglądarce na używanie perspektywy pierwszej osoby oraz sterowanie w niej kamerą za pomocą myszy"/>
 			<check_box label="Awatar widoczny w trybie pierwszoosobowym" name="first_person_avatar_visible"/>
 			<check_box label="Interfejs widoczny w trybie pierwszoosobowym" name="first_person_ui_visible"/>
@@ -41,6 +55,8 @@
 			<check_box label="Wyłącz oczekiwanie na animacje przed-skoku oraz lądowania (szybki skok)" name="FSIgnoreFinishAnimation"/>
 			<check_box label="Odtwórz dźwięk podczas teleportacji" name="PlayTeleportSound"/>
 			<check_box label="Zawsze lataj po teleportacji" name="FSFlyAfterTeleport"/>
+			<check_box label="Obróć awatara podczas cofania się" name="backwardsturnavatar" tool_tip="Obracaj awatara podczas cofania się w taki sposób, aby twarz była skierowana w stronę kamery."/>
+			<check_box label="Obróć awatara w kierunku zaznaczonego obiektu" name="FSTurnAvatarToSelectedObject" tool_tip="Obracaj awatara w taki sposób, aby twarz była skierowana w stronę zaznaczonego w danej chwili obiektu."/>
 			<text name="movelock_lbl">
 				Jeśli unieruchamianie wbudowane w Most LSL jest aktywne...
 			</text>
@@ -63,23 +79,10 @@
 			</combo_box>
 			<button label="Konfiguruj joystick" name="joystick_setup_button"/>
 		</panel>
-		<panel name="tab-firestorm">
-			<text name="camera_options_label">
-				Opcje kamery:
-			</text>
-			<check_box label="Nie resetuj kamery, gdy kliknę na swojego awatara" name="clickonavatarkeepscamera" tool_tip="Normalnie gdy klikniesz na swojego awatara pozycja kamery ulega zresetowaniu. Ta opcja usuwa to zachowanie."/>
-			<check_box label="Resetowanie pozycji kamery po teleportacji (wewnątrz regionu)" name="FSResetCameraOnTP" tool_tip="Normalnie pozycja kamery ulega zresetowaniu po teleportacji. Ta opcja zapobiega temu zachowaniu."/>
-			<check_box label="Resetowanie pozycji kamery przy poruszaniu się awatarem" name="FSResetCameraOnMovement"/>
-			<check_box label="Wyłącz minimalną odległość przybliżenia kamery" name="disableminzoomdist" tool_tip="Wyłącz ograniczenie w przybliżaniu obiektów."/>
-			<check_box label="Obracaj awatara w stronę patrzenia kamery podczas resetowania widoku" name="resetviewturnsavatar" tool_tip="Po zresetowaniu widoku (lub naciśnięciu klawisza ESC) kierunek patrzenia kamery zostaje zachowany, a awatar - obrócony w jego stronę."/>
-			<check_box label="Przenikanie kamery przez primy bez ograniczeń" name="ignorecameraconstraints" tool_tip="Ignoruje 'pchnięcie' stosowane przez symulator, aby utrzymać kamerę na zewnątrz obiektów."/>
-			<check_box label="Pokazuj standardowe, małe okienko sterowania kamerą zawsze jako nieprzezroczyste" name="FSAlwaysOpaqueCameraControls"/>
+		<panel label="Mapa i minimapa" name="tab-maps">
 			<text name="minimap_options_label">
 				Opcje minimapy:
 			</text>
-			<text name="ignorecameraconstraints_requires_restart">
-				(wymaga restartu)
-			</text>
 			<check_box label="Włącz rotację minimapy" name="minimaprotate" tool_tip="Obraca miniaturką mapy świata w zależności od tego, w którą stronę zwrócony jest awatar."/>
 			<text name="netmap_double_click_action_lbl">
 				Podwójny klik na minimapie:
@@ -96,10 +99,6 @@
 			<check_box label="Filtruj powtarzające się landmarki na mapie świata" name="WorldmapFilterDuplicateLandmarks" tool_tip="Filtruj zduplikowane landmarki w liście landmarków na mapie świata."/>
 			<check_box label="Pokazuj dodatkowe informacje o regionie na mapie świata" name="FSAdvancedWorldmapRegionInfo" tool_tip="Pokazuj dodatkowe informacje o regionie na mapie świata (liczbę awatarów i poziom dojrzałości)."/>
 			<check_box label="Pokazuj koordynaty siatki na mapie świata" name="FSShowRegionGridCoordinates" tool_tip="Pokazuj koordynaty siatki (w jednostkach regionów) na mapie świata."/>
-			<check_box label="Powiadom, jeśli wersja symulatora ulegnie zmianie podczas zmiany regionu" name="FSShowServerVersionChangeNotice" tool_tip="Wyświetla powiadomienie, jeśli wersja symulatora ulegnie zmianie podczas teleportowania się lub przekraczania granicy regionu."/>
-			<check_box label="Pokazuj kanał symulatora w pasku statusu" name="FSStatusbarShowSimulatorVersion" tool_tip="Pokazuj obecny kanał symulatora na pasku statusu w stylu V1."/>
-			<check_box label="Obróć awatara podczas cofania się" name="backwardsturnavatar" tool_tip="Obracaj awatara podczas cofania się w taki sposób, aby twarz była skierowana w stronę kamery."/>
-			<check_box label="Obróć awatara w kierunku zaznaczonego obiektu" name="FSTurnAvatarToSelectedObject" tool_tip="Obracaj awatara w taki sposób, aby twarz była skierowana w stronę zaznaczonego w danej chwili obiektu."/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_move.xml b/indra/newview/skins/default/xui/pt/panel_preferences_move.xml
index 98f856c3d3..d0b776e9c3 100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_move.xml
@@ -11,6 +11,9 @@
 			<check_box label="Construir/Editar" name="edit_camera_movement" tool_tip="Use o posicionamento automático da câmera quando entrar e sair do modo de edição"/>
 			<check_box label="Aparência" name="appearance_camera_movement" tool_tip="Use o posicionamento automático da câmera quando em modo de edição"/>
 			<check_box initial_value="verdadeiro" label="Barra lateral" name="appearance_sidebar_positioning" tool_tip="Usar posicionamento automático da câmera na barra lateral"/>
+		</panel>
+		<!--Mouselook-->
+		<panel name="tab-mouselook">
 			<check_box label="Mostre-me em visão de mouse" name="first_person_avatar_visible"/>
 			<text name="Mouse Sensitivity">
 				Sensibilidade do mouse:
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
index 3315302c34..e904eff421 100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
@@ -10,8 +10,18 @@
 			  Автоматическая установка позиции для:
 			</text>
 			<check_box label="Режима создания/редактирования" name="edit_camera_movement" tool_tip="Производить автоматическое позиционирование камеры при входе в режим редактирования и выходе из него"/>
-			<check_box label="Изменения внешности" name="appearance_camera_movement" tool_tip="Производить автоматическое позиционирование камеры в режиме изменения внешности"/>
-			<check_box initial_value="true" label="Боковой панели" name="appearance_sidebar_positioning" tool_tip="Производить автоматическое позиционирование камеры для боковой панели"/>
+			<check_box label="Изменения внешности" name="appearance_camera_movement" tool_tip="Производить автоматическое позиционирование камеры в режиме изменения внешности" width="150"/>
+			<check_box initial_value="true" label="Боковой панели" name="appearance_sidebar_positioning" tool_tip="Производить автоматическое позиционирование камеры для боковой панели"/>			
+			<check_box label="Нажатие на ваш аватар держит положение камеры" name="clickonavatarkeepscamera" tool_tip=""/>
+			<check_box label="Отключить минимальное расстояние приближения камеры" name="disableminzoomdist" tool_tip=""/>
+			<check_box label="Разрешить двигаться камере без ограничений(не через примитивы)" name="ignorecameraconstraints" tool_tip=""/>
+			<text name="ignorecameraconstraints_requires_restart" left_pad="70">
+				(перезапуск)
+			</text>
+		</panel>
+
+		<!-- Mouselook -->
+		<panel name="tab-mouselook">
 			<check_box label="Показать аватара от 1-го лица" name="first_person_avatar_visible"/>
 			<check_box label="Показать настройки от 1ого лица" name="mouselook_instructions_visible"/>
 			<text name="Mouse Sensitivity" width="195">
@@ -25,6 +35,7 @@
 			<check_box label="Клавиши стрелок всегда перемещают меня" name="arrow_keys_move_avatar_check"/>
 			<check_box label="Бег после двойного нажатия на клавишу" name="tap_tap_hold_to_run"/>
 			<check_box label="Взлететь / Приземлиться при удержании вверх / вниз" name="automatic_fly" />
+			<check_box label="Повернуть Аватара если он идёт задом" name="backwardsturnavatar" tool_tip="Задом, в смысле тороны..."/>
 			<check_box label="Звуковой эффект при телепортации" name="PlayTeleportSound"/>
 			<text name="single_click_action_lbl">
 				Простой щелчок для:
@@ -44,20 +55,10 @@
 			<button label="Настройки 3D джойстика" name="joystick_setup_button"/>
 		</panel>
 
-		<!-- Firestorm -->
-		<panel label="Файршторм" name="tab-firestorm">
-			<text name="camera_options_label">
-			   Опции камеры:
-			</text>
-			<check_box label="Нажатие на ваш аватар держит положение камеры" name="clickonavatarkeepscamera" tool_tip=""/>
-			<check_box label="Отключить минимальное расстояние приближения камеры" name="disableminzoomdist" tool_tip=""/>
-			<check_box label="Разрешить двигаться камере без ограничений(не через примитивы)" name="ignorecameraconstraints" tool_tip=""/>
-			<text name="ignorecameraconstraints_requires_restart">
-				(перезапуск)
-			</text>
+		<!-- Maps -->
+		<panel label="Файршторм" name="tab-maps">
 			<check_box label="Повернуть радар по поз. аватара" name="minimaprotate" tool_tip=""/>
 			<check_box name="MiniMapChatRing" label="Показать кольцо на радаре, который указывает диапазона чата"/>
-			<check_box label="Повернуть Аватара если он идёт задом" name="backwardsturnavatar" tool_tip="Задом, в смысле тороны..."/>
 			<check_box label="Фильтра дубликатов закладок(LM) на карте мира" name="WorldmapFilterDuplicateLandmarks" tool_tip=""/>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_move.xml b/indra/newview/skins/default/xui/tr/panel_preferences_move.xml
index c35eaec9c3..230fcdffb4 100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_move.xml
@@ -1,39 +1,48 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Hareket Et" name="move_panel">
-	<slider label="Gröünüm açısı" name="camera_fov"/>
-	<slider label="Mesafe" name="camera_offset_scale"/>
-	<text name="heading2">
-		Şunun için otomatik konum:
-	</text>
-	<check_box label="İnşa Et/Düzenle" name="edit_camera_movement" tool_tip="Düzenleme moduna girerken ve düzenleme modundan çıkarken otomatik kamera konumunu kullanın"/>
-	<check_box label="Görünüm" name="appearance_camera_movement" tool_tip="Düzenleme modundayken otomatik kamera konumunu kullan"/>
-	<text name="keyboard_lbl">
-		Klavye:
-	</text>
-	<check_box label="Ok tuşları beni her zaman hareket ettirir" name="arrow_keys_move_avatar_check"/>
-	<check_box label="Koşmak için iki kez dokun ve tut" name="tap_tap_hold_to_run"/>
-	<text name="mouse_lbl">
-		Fare:
-	</text>
-	<check_box label="Fare üzerinden görünümde beni göster" name="first_person_avatar_visible"/>
-	<text name=" Mouse Sensitivity">
-		Fare üzerinden görünümde fare hassasiyeti
-	</text>
-	<check_box label="Tersine çevir" name="invert_mouse"/>
-	<text name="single_click_action_lbl">
-		Arazi üzerine tek tıklama:
-	</text>
-	<combo_box name="single_click_action_combo">
-		<combo_box.item label="Eylem yok" name="0"/>
-		<combo_box.item label="Tıklanan noktaya hareket et" name="1"/>
-	</combo_box>
-	<text name="double_click_action_lbl">
-		Arazi üzerine çift tıklama:
-	</text>
-	<combo_box name="double_click_action_combo">
-		<combo_box.item label="Eylem yok" name="0"/>
-		<combo_box.item label="Tıklanan noktaya hareket et" name="1"/>
-		<combo_box.item label="Tıklanan noktaya ışınla" name="2"/>
-	</combo_box>
-	<button label="Diğer Aygıtlar" name="joystick_setup_button"/>
+	<tab_container name="tabs">
+		<panel name="tab-view">
+			<slider label="Gröünüm açısı" name="camera_fov"/>
+			<slider label="Mesafe" name="camera_offset_scale"/>
+			<text name="heading2">
+				Şunun için otomatik konum:
+			</text>
+			<check_box label="İnşa Et/Düzenle" name="edit_camera_movement" tool_tip="Düzenleme moduna girerken ve düzenleme modundan çıkarken otomatik kamera konumunu kullanın"/>
+			<check_box label="Görünüm" name="appearance_camera_movement" tool_tip="Düzenleme modundayken otomatik kamera konumunu kullan"/>
+		</panel>
+		<panel name="tab-mouselook">
+			<text name="mouse_lbl">
+				Fare:
+			</text>
+			<check_box label="Fare üzerinden görünümde beni göster" name="first_person_avatar_visible"/>
+			<text name=" Mouse Sensitivity">
+				Fare üzerinden görünümde fare hassasiyeti
+			</text>
+			<check_box label="Tersine çevir" name="invert_mouse"/>
+		</panel>
+		<panel name="tab-movement">
+			<check_box label="Ok tuşları beni her zaman hareket ettirir" name="arrow_keys_move_avatar_check"/>
+			<check_box label="Koşmak için iki kez dokun ve tut" name="tap_tap_hold_to_run"/>
+			<text name="single_click_action_lbl">
+				Arazi üzerine tek tıklama:
+			</text>
+			<combo_box name="single_click_action_combo">
+				<combo_box.item label="Eylem yok" name="0"/>
+				<combo_box.item label="Tıklanan noktaya hareket et" name="1"/>
+			</combo_box>
+			<text name="double_click_action_lbl">
+				Arazi üzerine çift tıklama:
+			</text>
+			<combo_box name="double_click_action_combo">
+				<combo_box.item label="Eylem yok" name="0"/>
+				<combo_box.item label="Tıklanan noktaya hareket et" name="1"/>
+				<combo_box.item label="Tıklanan noktaya ışınla" name="2"/>
+			</combo_box>
+			<button label="Diğer Aygıtlar" name="joystick_setup_button"/>
+		</panel>
+		<panel name="tab-maps">
+		
+		
+		</panel>
+	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
index 9b2650d796..8aaa7c3b9d 100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
@@ -10,14 +10,12 @@
 			</text>
 			<check_box label="建造 / 編輯" name="edit_camera_movement" tool_tip="使用進入或離開編輯模式時自動調整攝影機位置功能"/>
 			<check_box label="編輯外觀" name="appearance_camera_movement" tool_tip="使用編輯模式時自動調整攝影機位置功能"/>
-	<text name="keyboard_lbl">
-		鍵盤：
-	</text>
-	<check_box label="總是使用方向鍵移動" name="arrow_keys_move_avatar_check"/>
-	<check_box label="連點按住後跑步" name="tap_tap_hold_to_run"/>
-	<text name="mouse_lbl">
-		滑鼠：
-	</text>
+		</panel>
+		<!--Mouselook-->
+		<panel name="tab-mouselook">
+			<text name="mouse_lbl">
+				滑鼠：
+			</text>
 			<check_box label="將我顯示於第一人稱視角中" name="first_person_avatar_visible"/>
 			<text name="Mouse Sensitivity">
 				第一人稱視角滑鼠敏感度：
@@ -26,21 +24,26 @@
 		</panel>
 		<!--Movement-->
 		<panel name="tab-movement">
-	<text name="single_click_action_lbl">
-		在土地上點按一下：
-	</text>
-	<combo_box name="single_click_action_combo">
-		<combo_box.item label="無動作" name="0"/>
-		<combo_box.item label="移動至點按的地點" name="1"/>
-	</combo_box>
-	<text name="double_click_action_lbl">
-		在土地上點按兩下：
-	</text>
-	<combo_box name="double_click_action_combo">
-		<combo_box.item label="無動作" name="0"/>
-		<combo_box.item label="移動至點按的地點" name="1"/>
-		<combo_box.item label="瞬間傳送至點按的地點" name="2"/>
-	</combo_box>
+			<text name="keyboard_lbl">
+				鍵盤：
+			</text>
+			<check_box label="總是使用方向鍵移動" name="arrow_keys_move_avatar_check"/>
+			<check_box label="連點按住後跑步" name="tap_tap_hold_to_run"/>
+			<text name="single_click_action_lbl">
+				在土地上點按一下：
+			</text>
+			<combo_box name="single_click_action_combo">
+				<combo_box.item label="無動作" name="0"/>
+				<combo_box.item label="移動至點按的地點" name="1"/>
+			</combo_box>
+			<text name="double_click_action_lbl">
+				在土地上點按兩下：
+			</text>
+			<combo_box name="double_click_action_combo">
+				<combo_box.item label="無動作" name="0"/>
+				<combo_box.item label="移動至點按的地點" name="1"/>
+				<combo_box.item label="瞬間傳送至點按的地點" name="2"/>
+			</combo_box>
 			<button label="其他設備" name="joystick_setup_button"/>
 		</panel>
 	</tab_container>

From 484942ef5fce8876b08ee16bd7439b86cfb055db Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 8 Dec 2014 09:01:19 +0100
Subject: [PATCH 154/229] Add show simulator version and menu search to
 statusbar context menu

---
 .../skins/default/xui/de/menu_hide_navbar.xml |  2 ++
 .../skins/default/xui/en/menu_hide_navbar.xml | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
index bb9b564a30..5b22535719 100755
--- a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
@@ -5,4 +5,6 @@
 	<menu_item_check label="Mini-Standortleiste anzeigen" name="ShowMiniLocationPanel"/>
 	<menu_item_check label="Suchleiste anzeigen" name="ShowSearchTopBar"/>
 	<menu_item_check label="Position in Menüleiste anzeigen" name="ShowMenuBarLocation"/>
+	<menu_item_check label="Simulator-Version in Menüleiste anzeigen" name="FSStatusbarShowSimulatorVersion"/>
+	<menu_item_check label="Menüsuche anzeigen" name="FSMenuSearch"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
index ef8657b18f..348dd60cbc 100755
--- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
@@ -65,4 +65,26 @@
              function="CheckControl"
              parameter="ShowMenuBarLocation" />
     </menu_item_check>
+    <menu_item_check
+         label="Show Simulator Version in Top Menu"
+         layout="topleft"
+         name="FSStatusbarShowSimulatorVersion">
+           <on_click
+             function="ToggleControl"
+             parameter="FSStatusbarShowSimulatorVersion" /> 
+             <on_check
+             function="CheckControl"
+             parameter="FSStatusbarShowSimulatorVersion" />
+    </menu_item_check>
+    <menu_item_check
+         label="Show Menu Search"
+         layout="topleft"
+         name="FSMenuSearch">
+           <on_click
+             function="ToggleControl"
+             parameter="FSMenuSearch" /> 
+             <on_check
+             function="CheckControl"
+             parameter="FSMenuSearch" />
+    </menu_item_check>
 </menu>

From 61099e81a666049fa49958cbbd7bbb81a48548ea Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 8 Dec 2014 09:33:24 +0100
Subject: [PATCH 155/229] FIRE-15085: Object view button on camera tools not
 working

---
 indra/newview/llfloatercamera.cpp | 34 ++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 13e54d2c02..f3e6ce6f9f 100755
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -661,15 +661,18 @@ void LLFloaterCamera::onClickCameraItem(const LLSD& param)
 // 		if (camera_floater)
 // 			camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
 // 	}
-	else if ("object_view" == name && camera_floater)
+	else if ("object_view" == name)
 	{
-		if (camera_floater->mUseFlatUI)
+		if (camera_floater)
 		{
-			camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
-		}
-		else
-		{
-			camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
+			if (camera_floater->mUseFlatUI)
+			{
+				camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
+			}
+			else
+			{
+				camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
+			}
 		}
 	}
 // </AW: Flat cam floater>
@@ -699,15 +702,18 @@ void LLFloaterCamera::onClickCameraItem(const LLSD& param)
 	{
 		gAgentCamera.changeCameraToMouselook();
 	}
-	else if ("object_view" == name && camera_floater)
+	else if ("object_view" == name)
 	{
-		if (camera_floater->mUseFlatUI)
+		if (camera_floater)
 		{
-			camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
-		}
-		else
-		{
-			camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
+			if (camera_floater->mUseFlatUI)
+			{
+				camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
+			}
+			else
+			{
+				camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
+			}
 		}
 	}
 	else

From 916c26c56c86a380e4b66f061c40dbee36378696 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 8 Dec 2014 12:24:14 +0100
Subject: [PATCH 156/229] FIRE-15057: "Allow media to autoplay" & "Allow Audio
 to autoplay" preference options enabled state is bugged

---
 .../skins/default/xui/en/panel_preferences_sound.xml        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 0a3c3f0e8c..99a2d591b4 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -249,8 +249,10 @@
          name="enable_music"
          top_delta="2"
          width="350">
+        <!--
             <check_box.commit_callback
              function="Pref.updateMediaAutoPlayCheckbox"/>
+        -->
         </check_box>
         <slider
          control_name="AudioLevelMedia"
@@ -297,8 +299,10 @@
          left_pad="5"
          name="enable_media"
          width="110">
+        <!--
             <check_box.commit_callback
              function="Pref.updateMediaAutoPlayCheckbox"/>
+        -->
         </check_box>
         <slider
          control_name="AudioLevelVoice"
@@ -350,7 +354,7 @@
         <check_box
          name="audio_auto_play_btn"
          control_name="FSParcelMusicAutoPlay"
-         enabled_control="AudioStreamingMedia"
+         enabled_control="AudioStreamingMusic"
          layout="topleft"
          height="16"
          width="230"

From 8a0897b7ae272469004cecdf6ff4cee7a46c491b Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 8 Dec 2014 13:31:58 +0100
Subject: [PATCH 157/229] FIRE-15053: Antispam newline flood protection fails
 after source has been blocked

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

diff --git a/indra/newview/NACLantispam.cpp b/indra/newview/NACLantispam.cpp
index d083d1226c..3d55bede7d 100644
--- a/indra/newview/NACLantispam.cpp
+++ b/indra/newview/NACLantispam.cpp
@@ -470,7 +470,7 @@ bool NACLAntiSpamRegistry::checkNewlineFlood(EAntispamQueue queue, const LLUUID&
 		}
 		return false;
 	}
-	return false;
+	return true;
 }
 
 bool NACLAntiSpamRegistry::isBlockedOnQueue(EAntispamQueue queue, const LLUUID& source)

From 432422ba223b0bea40d3df6968b815724e7e737d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 8 Dec 2014 13:33:24 +0100
Subject: [PATCH 158/229] Fix typo in German translation

---
 indra/newview/skins/default/xui/de/notifications.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index cc5c5cfe82..9157f2269e 100755
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -4752,11 +4752,11 @@ AntiSpam: [SOURCE] wurde wegen Spam vom Typ [QUEUE] ([COUNT] mal in [PERIOD] Sek
 	</notification>
 
 	<notification name="AntiSpamImNewLineFloodBlocked">
-AntiSpam: [SOURCE] wurde wegen senden einer Instant Message mit mehr als [COUNT] Zeilen blockiert.
+AntiSpam: [SOURCE] wurde wegen Senden einer Instant Message mit mehr als [COUNT] Zeilen blockiert.
 	</notification>
 
 	<notification name="AntiSpamChatNewLineFloodBlocked">
-AntiSpam: [SOURCE] wurde wegen senden einer Chatnachricht mit mehr als [COUNT] Zeilen blockiert.
+AntiSpam: [SOURCE] wurde wegen Senden einer Chatnachricht mit mehr als [COUNT] Zeilen blockiert.
 	</notification>
 
 	<notification name="MeshMaxConcurrentReqTooHigh">

From 5a4a8cd609460ec6a6a57090427477f4d3776745 Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Mon, 8 Dec 2014 13:00:01 +0000
Subject: [PATCH 159/229] FIRE-15083 : Fixed typo in preferences - 'flash chat
 toolbar if new a IM arrives'

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 2478273d78..1402950242 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -644,7 +644,7 @@
              height="18"
              name="FSNotifyIMFlash"
              control_name="FSNotifyIMFlash"
-             label="Flash chat toolbar button if new a IM arrives"
+             label="Flash chat toolbar button if a new IM arrives"
              tool_tip="Flashes the chat toolbar button if a new (group) IM arrives. The IM window must be docked to the conversations window and the conversations window must be closed for the button to flash. This option is only available if IMs will be shown in tabs instead of separate windows (see &quot;General&quot; tab)."/>
 
             <check_box

From 5145be8536f3060dcd593c560e62289251da9b8b Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Mon, 8 Dec 2014 13:08:03 +0000
Subject: [PATCH 160/229] FIRE-15083 : Typo fix for 'search menus'

---
 indra/newview/skins/default/xui/en/panel_status_bar.xml      | 2 +-
 indra/newview/skins/starlight/xui/en/panel_status_bar.xml    | 2 +-
 indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index c371d3dec1..8b9368b0a1 100755
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -245,7 +245,7 @@
 		 clear_button_visible="true"
 		 follows="left|top"
 		 height="18"
-		 label="Search Menu"
+		 label="Search Menus"
 		 layout="topleft"
 		 left="0"
 		 max_length_bytes="255"
diff --git a/indra/newview/skins/starlight/xui/en/panel_status_bar.xml b/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
index 1bdb117054..0f417fb584 100644
--- a/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
@@ -230,7 +230,7 @@
 		 clear_button_visible="true"
 		 follows="left|top"
 		 height="18"
-		 label="Search Menu"
+		 label="Search Menus"
 		 layout="topleft"
 		 left="0"
 		 max_length_bytes="255"
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml b/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
index 8675e0d6a1..e009425163 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
@@ -228,7 +228,7 @@
 		 clear_button_visible="true"
 		 follows="left|top"
 		 height="18"
-		 label="Search Menu"
+		 label="Search Menus"
 		 layout="topleft"
 		 left="0"
 		 max_length_bytes="255"

From e5afc12660ef77218b086d4eafe1c8bf197ce143 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 8 Dec 2014 15:02:39 +0100
Subject: [PATCH 161/229] FIRE-13477: Prevent Antispam from spamming the user
 with block messages if an object is blocked who's owner has been blocked
 already

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

diff --git a/indra/newview/NACLantispam.cpp b/indra/newview/NACLantispam.cpp
index 3d55bede7d..eb2e9f792a 100644
--- a/indra/newview/NACLantispam.cpp
+++ b/indra/newview/NACLantispam.cpp
@@ -656,8 +656,11 @@ void NACLAntiSpamRegistry::processObjectPropertiesFamily(LLMessageSystem* msg)
 	{
 		AntispamObjectData data = found->second;
 
-		data.mName = LLSLURL("objectim", id, "").getSLURLString() + "?name=" + LLURI::escape(name) + "&owner=" + owner_id.asString();
-		notify(data);
+		if (!isBlockedOnQueue(data.mQueue, owner_id))
+		{
+			data.mName = LLSLURL("objectim", id, "").getSLURLString() + "?name=" + LLURI::escape(name) + "&owner=" + owner_id.asString();
+			notify(data);
+		}
 
 		mObjectData.erase(found);
 	}

From 520a56c756403ca8567f70737c2550859803d7bf Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Mon, 8 Dec 2014 19:55:58 +0100
Subject: [PATCH 162/229] Updated Polish translation

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

diff --git a/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml
index dd9c154e10..9aa81ef733 100755
--- a/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml
@@ -4,4 +4,6 @@
 	<menu_item_check label="Pokaż pasek ulubionych" name="ShowNavbarFavoritesPanel"/>
 	<menu_item_check label="Pokaż pasek wyszukiwarki" name="ShowSearchTopBar"/>
 	<menu_item_check label="Pokaż lokalizację w menu na górze" name="ShowMenuBarLocation"/>
+	<menu_item_check label="Pokazuj kanał symulatora w pasku statusu" name="FSStatusbarShowSimulatorVersion"/>
+	<menu_item_check label="Pokaż wyszukiwarkę pozycji w menu" name="FSMenuSearch"/>
 </menu>

From 7f369404b31ce9948f9475c15a523bce360c4ae6 Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Mon, 8 Dec 2014 23:08:32 -0800
Subject: [PATCH 163/229] Fire-15090 - typo in description of a window size,
 also updated list based on STEAM hardware stats for November 2014

---
 .../default/xui/en/floater_window_size.xml    | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_window_size.xml b/indra/newview/skins/default/xui/en/floater_window_size.xml
index e8c7c94e67..331acd7dd9 100755
--- a/indra/newview/skins/default/xui/en/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/en/floater_window_size.xml
@@ -37,41 +37,49 @@
        name="item2"
        value="1024 x 768" />
       <combo_box.item
-       label="1280 x 720 (16:9 HDTV)"
+       label="1280 x 720 (16:9 HD)"
        name="item3"
        value="1280 x 720" />
       <combo_box.item
-       label="1280 x 800 (5:8 WXGA)"
+       label="1280 x 800 (16:10 WXGA)"
        name="item4"
        value="1280 x 800" />
       <combo_box.item
-       label="1280 x 1024 (5:4 SXGA)"
+       label="1360 x 768 (16:9 WXGA)"
        name="item5"
-       value="1280 x 1024" />
+       value="1360 x 768" />
       <combo_box.item
-       label="1440 x 900 (8:5 WSXGA)"
+       label="1366 x 768 (16:9 WXGA)"
        name="item7"
+       value="1366 x 768" />
+      <combo_box.item
+       label="1440 x 900 (16:10 WXGA+)"
+       name="item8"
        value="1440 x 900" />
       <combo_box.item
-       label="1600 x 900 (16:9 HD+)"
-       name="item8"
-       value="1600 x 900" />
-      <combo_box.item
-       label="1600 x 1200 (4:3 UXGA)"
+       label="1536 x 864 (16:9)"
        name="item9"
-       value="1600 x 1200" />
+       value="1536 x 864" />
       <combo_box.item
-       label="1680 x 1050 (8:5 WSXGA+)"
+       label="1600 x 900 (16:9 HD+)"
        name="item10"
+       value="1680 x 900" />
+      <combo_box.item
+       label="1680 x 1050 (16:10 WSXGA+)"
+       name="item11"
        value="1680 x 1050" />
       <combo_box.item
-       label="1920 x 1080 (16:9 HDTV)"
-       name="item11"
+       label="1920 x 1080 (16:9 FHD)"
+       name="item12"
        value="1920 x 1080" />
       <combo_box.item
-       label="1920 x 1200 (8:5 WUXGA)"
-       name="item12"
+       label="1920 x 1200 (16:10 WUXGA)"
+       name="item13"
        value="1920 x 1200" />
+      <combo_box.item
+       label="2560 x 1440 (16:9 QHD)"
+       name="item14"
+       value="2560 x 1440" />
     </combo_box>
     <button
      follows="right|bottom"

From d2d129cb7e50aa8749cc9794ab83361d82d2020b Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 9 Dec 2014 08:48:20 +0100
Subject: [PATCH 164/229] FIRE-15090: Fix even more typos...

---
 indra/newview/skins/default/xui/en/floater_window_size.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/floater_window_size.xml b/indra/newview/skins/default/xui/en/floater_window_size.xml
index 331acd7dd9..d715f086ac 100755
--- a/indra/newview/skins/default/xui/en/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/en/floater_window_size.xml
@@ -63,7 +63,7 @@
       <combo_box.item
        label="1600 x 900 (16:9 HD+)"
        name="item10"
-       value="1680 x 900" />
+       value="1600 x 900" />
       <combo_box.item
        label="1680 x 1050 (16:10 WSXGA+)"
        name="item11"

From e80f820e08334fb3c9b883f9101af2db1f47b0fd Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 9 Dec 2014 08:51:53 +0100
Subject: [PATCH 165/229] FIRE-15090: Propagate changes to other languages

---
 .../default/xui/de/floater_window_size.xml    | 20 +++++++++--------
 .../default/xui/es/floater_window_size.xml    | 20 +++++++++--------
 .../default/xui/fr/floater_window_size.xml    | 20 +++++++++--------
 .../default/xui/it/floater_window_size.xml    | 20 +++++++++--------
 .../default/xui/ja/floater_window_size.xml    | 22 ++++++++++---------
 .../default/xui/pt/floater_window_size.xml    | 20 +++++++++--------
 .../default/xui/ru/floater_window_size.xml    | 20 +++++++++--------
 .../default/xui/tr/floater_window_size.xml    | 20 +++++++++--------
 .../default/xui/zh/floater_window_size.xml    | 20 +++++++++--------
 9 files changed, 100 insertions(+), 82 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/floater_window_size.xml b/indra/newview/skins/default/xui/de/floater_window_size.xml
index 732015cb6e..b1e94127a8 100755
--- a/indra/newview/skins/default/xui/de/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/de/floater_window_size.xml
@@ -9,15 +9,17 @@
 	<combo_box name="window_size_combo" tool_tip="Breite x Höhe">
 		<combo_box.item label="1000 x 700 (Standard)" name="item1"/>
 		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
-		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
-		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
-		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
-		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
-		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
-		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
-		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
-		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
-		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
+		<combo_box.item label="1280 x 720 (16:9 HD)" name="item3"/>
+		<combo_box.item label="1280 x 800 (16:10 WXGA)" name="item4"/>
+		<combo_box.item label="1360 x 768 (16:9 WXGA)" name="item5"/>
+		<combo_box.item label="1366 x 768 (16:9 WXGA)" name="item7"/>
+		<combo_box.item label="1440 x 900 (16:10 WXGA+)" name="item8"/>
+		<combo_box.item label="1536 x 864 (16:9)" name="item9"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item10"/>
+		<combo_box.item label="1680 x 1050 (16:10 WSXGA+)" name="item11"/>
+		<combo_box.item label="1920 x 1080 (16:9 FHD)" name="item12"/>
+		<combo_box.item label="1920 x 1200 (16:10 WUXGA)" name="item13"/>
+		<combo_box.item label="2560 x 1440 (16:9 QHD)" name="item14"/>
 	</combo_box>
 	<button label="Festlegen" name="set_btn"/>
 	<button label="Abbrechen" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/es/floater_window_size.xml b/indra/newview/skins/default/xui/es/floater_window_size.xml
index 6c1ad02319..76e4bf4856 100755
--- a/indra/newview/skins/default/xui/es/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/es/floater_window_size.xml
@@ -9,15 +9,17 @@
 	<combo_box name="window_size_combo" tool_tip="ancho x alto">
 		<combo_box.item label="1000 x 700 (por defecto)" name="item1"/>
 		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
-		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
-		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
-		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
-		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
-		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
-		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
-		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
-		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
-		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
+		<combo_box.item label="1280 x 720 (16:9 HD)" name="item3"/>
+		<combo_box.item label="1280 x 800 (16:10 WXGA)" name="item4"/>
+		<combo_box.item label="1360 x 768 (16:9 WXGA)" name="item5"/>
+		<combo_box.item label="1366 x 768 (16:9 WXGA)" name="item7"/>
+		<combo_box.item label="1440 x 900 (16:10 WXGA+)" name="item8"/>
+		<combo_box.item label="1536 x 864 (16:9)" name="item9"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item10"/>
+		<combo_box.item label="1680 x 1050 (16:10 WSXGA+)" name="item11"/>
+		<combo_box.item label="1920 x 1080 (16:9 FHD)" name="item12"/>
+		<combo_box.item label="1920 x 1200 (16:10 WUXGA)" name="item13"/>
+		<combo_box.item label="2560 x 1440 (16:9 QHD)" name="item14"/>
 	</combo_box>
 	<button label="Configurar" name="set_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_window_size.xml b/indra/newview/skins/default/xui/fr/floater_window_size.xml
index 11c2e439bd..b1d360afd8 100755
--- a/indra/newview/skins/default/xui/fr/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/fr/floater_window_size.xml
@@ -9,15 +9,17 @@
 	<combo_box name="window_size_combo" tool_tip="largeur x hauteur">
 		<combo_box.item label="1000 x 700 (par défaut)" name="item1"/>
 		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
-		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
-		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
-		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
-		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
-		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
-		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
-		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
-		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
-		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
+		<combo_box.item label="1280 x 720 (16:9 HD)" name="item3"/>
+		<combo_box.item label="1280 x 800 (16:10 WXGA)" name="item4"/>
+		<combo_box.item label="1360 x 768 (16:9 WXGA)" name="item5"/>
+		<combo_box.item label="1366 x 768 (16:9 WXGA)" name="item7"/>
+		<combo_box.item label="1440 x 900 (16:10 WXGA+)" name="item8"/>
+		<combo_box.item label="1536 x 864 (16:9)" name="item9"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item10"/>
+		<combo_box.item label="1680 x 1050 (16:10 WSXGA+)" name="item11"/>
+		<combo_box.item label="1920 x 1080 (16:9 FHD)" name="item12"/>
+		<combo_box.item label="1920 x 1200 (16:10 WUXGA)" name="item13"/>
+		<combo_box.item label="2560 x 1440 (16:9 QHD)" name="item14"/>
 	</combo_box>
 	<button label="Choisir" name="set_btn"/>
 	<button label="Annuler" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_window_size.xml b/indra/newview/skins/default/xui/it/floater_window_size.xml
index fef423aefe..28c28307c9 100755
--- a/indra/newview/skins/default/xui/it/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/it/floater_window_size.xml
@@ -9,15 +9,17 @@
 	<combo_box name="window_size_combo" tool_tip="larghezza x altezza">
 		<combo_box.item label="1000 x 700 (predefinito)" name="item1"/>
 		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
-		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
-		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
-		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
-		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
-		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
-		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
-		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
-		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
-		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
+		<combo_box.item label="1280 x 720 (16:9 HD)" name="item3"/>
+		<combo_box.item label="1280 x 800 (16:10 WXGA)" name="item4"/>
+		<combo_box.item label="1360 x 768 (16:9 WXGA)" name="item5"/>
+		<combo_box.item label="1366 x 768 (16:9 WXGA)" name="item7"/>
+		<combo_box.item label="1440 x 900 (16:10 WXGA+)" name="item8"/>
+		<combo_box.item label="1536 x 864 (16:9)" name="item9"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item10"/>
+		<combo_box.item label="1680 x 1050 (16:10 WSXGA+)" name="item11"/>
+		<combo_box.item label="1920 x 1080 (16:9 FHD)" name="item12"/>
+		<combo_box.item label="1920 x 1200 (16:10 WUXGA)" name="item13"/>
+		<combo_box.item label="2560 x 1440 (16:9 QHD)" name="item14"/>
 	</combo_box>
 	<button label="Imposta" name="set_btn"/>
 	<button label="Annulla" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_window_size.xml b/indra/newview/skins/default/xui/ja/floater_window_size.xml
index 416813d6cc..04f0d1dfa5 100755
--- a/indra/newview/skins/default/xui/ja/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/ja/floater_window_size.xml
@@ -8,16 +8,18 @@
 	</text>
 	<combo_box name="window_size_combo" tool_tip="横幅 x 高さ">
 		<combo_box.item label="1000 x 700 （デフォルト）" name="item1"/>
-		<combo_box.item label="1024 x 768 （4:3 XGA）" name="item2"/>
-		<combo_box.item label="1280 x 720 （16:9 HDTV）" name="item3"/>
-		<combo_box.item label="1280 x 800 （5:8 WXGA）" name="item4"/>
-		<combo_box.item label="1280 x 1024 （5:4 SXGA）" name="item5"/>
-		<combo_box.item label="1440 x 900 （8:5 WSXGA）" name="item7"/>
-		<combo_box.item label="1600 x 900 （16:9 HD+）" name="item8"/>
-		<combo_box.item label="1600 x 1200 （4:3 UXGA）" name="item9"/>
-		<combo_box.item label="1680 x 1050 （8:5 WSXGA+）" name="item10"/>
-		<combo_box.item label="1920 x 1080 （16:9 HDTV）" name="item11"/>
-		<combo_box.item label="1920 x 1200 （8:5 WUXGA）" name="item12"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HD)" name="item3"/>
+		<combo_box.item label="1280 x 800 (16:10 WXGA)" name="item4"/>
+		<combo_box.item label="1360 x 768 (16:9 WXGA)" name="item5"/>
+		<combo_box.item label="1366 x 768 (16:9 WXGA)" name="item7"/>
+		<combo_box.item label="1440 x 900 (16:10 WXGA+)" name="item8"/>
+		<combo_box.item label="1536 x 864 (16:9)" name="item9"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item10"/>
+		<combo_box.item label="1680 x 1050 (16:10 WSXGA+)" name="item11"/>
+		<combo_box.item label="1920 x 1080 (16:9 FHD)" name="item12"/>
+		<combo_box.item label="1920 x 1200 (16:10 WUXGA)" name="item13"/>
+		<combo_box.item label="2560 x 1440 (16:9 QHD)" name="item14"/>
 	</combo_box>
 	<button label="設定" name="set_btn"/>
 	<button label="キャンセル" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_window_size.xml b/indra/newview/skins/default/xui/pt/floater_window_size.xml
index 7deb799bd7..8dc0860e4e 100755
--- a/indra/newview/skins/default/xui/pt/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/pt/floater_window_size.xml
@@ -9,15 +9,17 @@
 	<combo_box name="window_size_combo" tool_tip="largura x altura">
 		<combo_box.item label="1000 x 700 (padrão)" name="item1"/>
 		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
-		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
-		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
-		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
-		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
-		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
-		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
-		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
-		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
-		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
+		<combo_box.item label="1280 x 720 (16:9 HD)" name="item3"/>
+		<combo_box.item label="1280 x 800 (16:10 WXGA)" name="item4"/>
+		<combo_box.item label="1360 x 768 (16:9 WXGA)" name="item5"/>
+		<combo_box.item label="1366 x 768 (16:9 WXGA)" name="item7"/>
+		<combo_box.item label="1440 x 900 (16:10 WXGA+)" name="item8"/>
+		<combo_box.item label="1536 x 864 (16:9)" name="item9"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item10"/>
+		<combo_box.item label="1680 x 1050 (16:10 WSXGA+)" name="item11"/>
+		<combo_box.item label="1920 x 1080 (16:9 FHD)" name="item12"/>
+		<combo_box.item label="1920 x 1200 (16:10 WUXGA)" name="item13"/>
+		<combo_box.item label="2560 x 1440 (16:9 QHD)" name="item14"/>
 	</combo_box>
 	<button label="Definir" name="set_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_window_size.xml b/indra/newview/skins/default/xui/ru/floater_window_size.xml
index fbff6a72b2..c8f15fc7e1 100755
--- a/indra/newview/skins/default/xui/ru/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/ru/floater_window_size.xml
@@ -9,15 +9,17 @@
 	<combo_box name="window_size_combo" tool_tip="ширина x высота">
 		<combo_box.item label="1000 x 700 (по умолчанию)" name="item1"/>
 		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
-		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
-		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
-		<combo_box.item label="1280 x 1024 (5:4 WXGA)" name="item5"/>
-		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
-		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
-		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
-		<combo_box.item label="1680 x 1050 (8:5 WSXGA)" name="item10"/>
-		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
-		<combo_box.item label="1920 x 1200 (8:5 UXGA)" name="item12"/>
+		<combo_box.item label="1280 x 720 (16:9 HD)" name="item3"/>
+		<combo_box.item label="1280 x 800 (16:10 WXGA)" name="item4"/>
+		<combo_box.item label="1360 x 768 (16:9 WXGA)" name="item5"/>
+		<combo_box.item label="1366 x 768 (16:9 WXGA)" name="item7"/>
+		<combo_box.item label="1440 x 900 (16:10 WXGA+)" name="item8"/>
+		<combo_box.item label="1536 x 864 (16:9)" name="item9"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item10"/>
+		<combo_box.item label="1680 x 1050 (16:10 WSXGA+)" name="item11"/>
+		<combo_box.item label="1920 x 1080 (16:9 FHD)" name="item12"/>
+		<combo_box.item label="1920 x 1200 (16:10 WUXGA)" name="item13"/>
+		<combo_box.item label="2560 x 1440 (16:9 QHD)" name="item14"/>
 	</combo_box>
 	<button label="Задать" name="set_btn"/>
 	<button label="Отмена" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_window_size.xml b/indra/newview/skins/default/xui/tr/floater_window_size.xml
index aff20e7960..1cbfdbc56a 100755
--- a/indra/newview/skins/default/xui/tr/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/tr/floater_window_size.xml
@@ -9,15 +9,17 @@
 	<combo_box name="window_size_combo" tool_tip="genişlik x yükseklik">
 		<combo_box.item label="1000 x 700 (varsayılan)" name="item1"/>
 		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
-		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
-		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
-		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
-		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
-		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
-		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
-		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
-		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
-		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
+		<combo_box.item label="1280 x 720 (16:9 HD)" name="item3"/>
+		<combo_box.item label="1280 x 800 (16:10 WXGA)" name="item4"/>
+		<combo_box.item label="1360 x 768 (16:9 WXGA)" name="item5"/>
+		<combo_box.item label="1366 x 768 (16:9 WXGA)" name="item7"/>
+		<combo_box.item label="1440 x 900 (16:10 WXGA+)" name="item8"/>
+		<combo_box.item label="1536 x 864 (16:9)" name="item9"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item10"/>
+		<combo_box.item label="1680 x 1050 (16:10 WSXGA+)" name="item11"/>
+		<combo_box.item label="1920 x 1080 (16:9 FHD)" name="item12"/>
+		<combo_box.item label="1920 x 1200 (16:10 WUXGA)" name="item13"/>
+		<combo_box.item label="2560 x 1440 (16:9 QHD)" name="item14"/>
 	</combo_box>
 	<button label="Ayarla" name="set_btn"/>
 	<button label="İptal" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_window_size.xml b/indra/newview/skins/default/xui/zh/floater_window_size.xml
index 3942f72d76..4873b00a0d 100755
--- a/indra/newview/skins/default/xui/zh/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/zh/floater_window_size.xml
@@ -9,15 +9,17 @@
 	<combo_box name="window_size_combo" tool_tip="寬度 x 高度">
 		<combo_box.item label="1000 x 700 （預設）" name="item1"/>
 		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
-		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
-		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
-		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
-		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
-		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
-		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
-		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
-		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
-		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
+		<combo_box.item label="1280 x 720 (16:9 HD)" name="item3"/>
+		<combo_box.item label="1280 x 800 (16:10 WXGA)" name="item4"/>
+		<combo_box.item label="1360 x 768 (16:9 WXGA)" name="item5"/>
+		<combo_box.item label="1366 x 768 (16:9 WXGA)" name="item7"/>
+		<combo_box.item label="1440 x 900 (16:10 WXGA+)" name="item8"/>
+		<combo_box.item label="1536 x 864 (16:9)" name="item9"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item10"/>
+		<combo_box.item label="1680 x 1050 (16:10 WSXGA+)" name="item11"/>
+		<combo_box.item label="1920 x 1080 (16:9 FHD)" name="item12"/>
+		<combo_box.item label="1920 x 1200 (16:10 WUXGA)" name="item13"/>
+		<combo_box.item label="2560 x 1440 (16:9 QHD)" name="item14"/>
 	</combo_box>
 	<button label="設定" name="set_btn"/>
 	<button label="取消" name="cancel_btn"/>

From 691a222b8718c2a070ab57ab787fdb17dd0aab7d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 9 Dec 2014 09:06:43 +0100
Subject: [PATCH 166/229] FIRE-15088: Preferences show wrong selected beam
 color on first run

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1b0ebb9c59..c776a5e301 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -18568,7 +18568,7 @@ Change of this parameter will affect the layout of buttons in notification toast
 			<key>Type</key>
 			<string>String</string>
 			<key>Value</key>
-			<string>===OFF===</string>
+			<string>Rainbow</string>
 		</map>
 		<key>FSMaxBeamsPerSecond</key>
 		<map>

From f824dbe40f38e94eea9712009ce9925b64a60006 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 9 Dec 2014 13:56:33 +0100
Subject: [PATCH 167/229] Set username provided by incoming P2P session data as
 IM floater title until we received the complete name data and also update
 typing notification properly

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

diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp
index 7303a02c25..72dd5d2730 100644
--- a/indra/newview/fsfloaterim.cpp
+++ b/indra/newview/fsfloaterim.cpp
@@ -763,6 +763,8 @@ BOOL FSFloaterIM::postBuild()
 
 	if ( im_session && im_session->isP2PSessionType())
 	{
+		mTypingStart.setArg("[NAME]", im_session->mName);
+		updateSessionName(im_session->mName, im_session->mName);
 		fetchAvatarName(im_session->mOtherParticipantID);
 	}
 	else
@@ -856,6 +858,10 @@ void FSFloaterIM::onAvatarNameCache(const LLUUID& agent_id,
 
 	updateSessionName(name, name);
 	mTypingStart.setArg("[NAME]", name);
+	if (mOtherTyping)
+	{
+		setTitle((gSavedSettings.getBOOL("FSTypingChevronPrefix") ? "> " : "") + mTypingStart.getString());
+	}
 	LL_DEBUGS("FSFloaterIM") << "Setting IM tab name to '" << name << "'" << LL_ENDL;
 	// </FS:Ansariel>
 }

From 2ab176d7058ed892f8a72e1986a0071fad4daef0 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 9 Dec 2014 15:27:04 +0100
Subject: [PATCH 168/229] Enable searching combobox items using a fulltext
 search instead of only a prefix search; Can be disabled by
 FSComboboxSubstringSearch setting in case of complains

---
 indra/llui/llcombobox.cpp               | 17 ++++++++++++-
 indra/llui/llscrolllistctrl.cpp         | 33 ++++++++++++++++++++++++-
 indra/llui/llscrolllistctrl.h           |  5 ++++
 indra/newview/app_settings/settings.xml | 11 +++++++++
 4 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index edd26fb1a1..7840b84d8b 100755
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -937,7 +937,10 @@ void LLComboBox::updateSelection()
 		mTextEntry->setTentative(FALSE);
 		mLastSelectedIndex = mList->getFirstSelectedIndex();
 	}
-	else if (mList->selectItemByPrefix(left_wstring, FALSE))
+	// <FS:Ansariel> Allow fulltext search in comboboxes
+	//else if (mList->selectItemByPrefix(left_wstring, FALSE))
+	else if (!LLControlGroup::getInstance("Global")->getBOOL("FSComboboxSubstringSearch") && mList->selectItemByPrefix(left_wstring, FALSE))
+	// </FS:Ansariel>
 	{
 		LLWString selected_item = utf8str_to_wstring(getSelectedItemLabel());
 		LLWString wtext = left_wstring + selected_item.substr(left_wstring.size(), selected_item.size());
@@ -948,6 +951,18 @@ void LLComboBox::updateSelection()
 		mHasAutocompletedText = TRUE;
 		mLastSelectedIndex = mList->getFirstSelectedIndex();
 	}
+	// <FS:Ansariel> Allow fulltext search in comboboxes
+	else if (LLControlGroup::getInstance("Global")->getBOOL("FSComboboxSubstringSearch") && mList->selectItemBySubstring(left_wstring, FALSE))
+	{
+		LLWString selected_item = utf8str_to_wstring(getSelectedItemLabel());
+		mTextEntry->setText(wstring_to_utf8str(left_wstring) + " (" + getSelectedItemLabel() + ")");
+		mTextEntry->setSelection(left_wstring.size(), mTextEntry->getWText().size());
+		mTextEntry->endSelection();
+		mTextEntry->setTentative(FALSE);
+		mHasAutocompletedText = TRUE;
+		mLastSelectedIndex = mList->getFirstSelectedIndex();
+	}
+	// </FS:Ansariel>
 	else // no matching items found
 	{
 		mList->deselectAllItems();
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index c352368bed..e14ca158a9 100755
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1318,6 +1318,13 @@ BOOL LLScrollListCtrl::selectItemByPrefix(const std::string& target, BOOL case_s
 // Selects first enabled item that has a name where the name's first part matched the target string.
 // Returns false if item not found.
 BOOL LLScrollListCtrl::selectItemByPrefix(const LLWString& target, BOOL case_sensitive)
+// <FS:Ansariel> Allow selection by substring match
+{
+	return selectItemByStringMatch(target, true, case_sensitive);
+}
+
+BOOL LLScrollListCtrl::selectItemByStringMatch(const LLWString& target, bool prefix_match, BOOL case_sensitive)
+// </FS:Ansariel>
 {
 	BOOL found = FALSE;
 
@@ -1369,7 +1376,18 @@ BOOL LLScrollListCtrl::selectItemByPrefix(const LLWString& target, BOOL case_sen
 			LLWString trimmed_label = item_label;
 			LLWStringUtil::trim(trimmed_label);
 			
-			BOOL select = item->getEnabled() && trimmed_label.compare(0, target_trimmed.size(), target_trimmed) == 0;
+			// <FS:Ansariel> Allow selection by substring match
+			//BOOL select = item->getEnabled() && trimmed_label.compare(0, target_trimmed.size(), target_trimmed) == 0;
+			BOOL select;
+			if (prefix_match)
+			{
+				select = item->getEnabled() && trimmed_label.compare(0, target_trimmed.size(), target_trimmed) == 0;
+			}
+			else
+			{
+				select = item->getEnabled() && trimmed_label.find(target_trimmed) != std::string::npos;
+			}
+			// </FS:Ansariel>
 
 			if (select)
 			{
@@ -1391,6 +1409,19 @@ BOOL LLScrollListCtrl::selectItemByPrefix(const LLWString& target, BOOL case_sen
 	return found;
 }
 
+// <FS:Ansariel> Allow selection by substring match
+BOOL LLScrollListCtrl::selectItemBySubstring(const std::string& target, BOOL case_sensitive)
+{
+	return selectItemBySubstring(utf8str_to_wstring(target), case_sensitive);
+}
+
+// Returns false if item not found.
+BOOL LLScrollListCtrl::selectItemBySubstring(const LLWString& target, BOOL case_sensitive)
+{
+	return selectItemByStringMatch(target, false, case_sensitive);
+}
+// </FS:Ansariel>
+
 const std::string LLScrollListCtrl::getSelectedItemLabel(S32 column) const
 {
 	LLScrollListItem* item;
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index f6e9e7c947..9aa5e5380f 100755
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -249,6 +249,11 @@ public:
 	BOOL			selectItemByLabel( const std::string& item, BOOL case_sensitive = TRUE, S32 column = 0 );		// FALSE if item not found
 	BOOL			selectItemByPrefix(const std::string& target, BOOL case_sensitive = TRUE);
 	BOOL			selectItemByPrefix(const LLWString& target, BOOL case_sensitive = TRUE);
+	// <FS:Ansariel> Allow selection by substring match
+	BOOL			selectItemBySubstring(const std::string& target, BOOL case_sensitive = TRUE);
+	BOOL			selectItemBySubstring(const LLWString& target, BOOL case_sensitive = TRUE);
+	BOOL			selectItemByStringMatch(const LLWString& target, bool prefix_match, BOOL case_sensitive = TRUE);
+	// </FS:Ansariel>
 	LLScrollListItem*  getItemByLabel( const std::string& item, BOOL case_sensitive = TRUE, S32 column = 0 );
 	const std::string	getSelectedItemLabel(S32 column = 0) const;
 	LLSD			getSelectedValue();
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c776a5e301..bd6c935911 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -22844,6 +22844,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>FSComboboxSubstringSearch</key>
+    <map>
+      <key>Comment</key>
+      <string>Allows fulltext search on comboboxes</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
   </map>
 </llsd>
 

From da17c6b0e5f7b84ba7ac34bbc43835bc7dd8bd2e Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 10 Dec 2014 11:00:31 +0100
Subject: [PATCH 169/229] Cleaning up the pie menu code

---
 indra/newview/piemenu.cpp      | 309 ++++++++++++++++++---------------
 indra/newview/piemenu.h        |   8 +-
 indra/newview/pieseparator.cpp |   3 +-
 indra/newview/pieseparator.h   |   1 -
 indra/newview/pieslice.cpp     |  22 +--
 indra/newview/pieslice.h       |   3 -
 6 files changed, 189 insertions(+), 157 deletions(-)

diff --git a/indra/newview/piemenu.cpp b/indra/newview/piemenu.cpp
index 4b7b19e497..bad5f9ab87 100644
--- a/indra/newview/piemenu.cpp
+++ b/indra/newview/piemenu.cpp
@@ -26,20 +26,18 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-#include "linden_common.h"
 
 #include "piemenu.h"
 #include "pieslice.h"
 #include "pieseparator.h"
 #include "llviewercontrol.h"
 #include "llviewerwindow.h"
-#include "v2math.h"
 
 // copied from LLMenuGL - Remove these lines over there when finished
-const S32 PIE_INNER_SIZE=20;		// radius of the inner pie circle
-const F32 PIE_POPUP_FACTOR=(F32)1.7f;		// pie menu size factor on popup
-const F32 PIE_POPUP_TIME=(F32)0.25f;		// time to shrink from popup size to regular size
-const S32 PIE_OUTER_SIZE=96;		// radius of the outer pie circle
+const S32 PIE_INNER_SIZE = 20;		// radius of the inner pie circle
+const F32 PIE_POPUP_FACTOR = 1.7f;		// pie menu size factor on popup
+const F32 PIE_POPUP_TIME = 0.25f;		// time to shrink from popup size to regular size
+const S32 PIE_OUTER_SIZE = 96;		// radius of the outer pie circle
 
 // register the pie menu globally as child widget
 static LLDefaultChildRegistry::Register<PieMenu> r1("pie_menu");
@@ -53,61 +51,64 @@ static PieChildRegistry::Register<PieSeparator> pie_r3("pie_separator");
 #define PIE_DRAW_BOUNDING_BOX 0		// debug
 
 // pie slice label text positioning
-const S32 PIE_X[] = {64,45, 0,-45,-63,-45,  0, 45};
-const S32 PIE_Y[] = { 0,44,73, 44,  0,-44,-73,-44};
+const S32 PIE_X[] = {64, 45,  0, -45, -63, -45,   0,  45};
+const S32 PIE_Y[] = { 0, 44, 73,  44,   0, -44, -73, -44};
 
 PieMenu::PieMenu(const LLContextMenu::Params& p) :
 	LLContextMenu(p)
 {
 	LL_DEBUGS() << "PieMenu::PieMenu()" << LL_ENDL;
 	// radius, so we need this *2
-	reshape(PIE_OUTER_SIZE*2,PIE_OUTER_SIZE*2,FALSE);
+	reshape(PIE_OUTER_SIZE * 2, PIE_OUTER_SIZE * 2, FALSE);
 	// set up the font for the menu
-	mFont=LLFontGL::getFont(LLFontDescriptor("SansSerif","Pie",LLFontGL::NORMAL));
-	if(!mFont)
+	mFont = LLFontGL::getFont(LLFontDescriptor("SansSerif", "Pie", LLFontGL::NORMAL));
+	if (!mFont)
 	{
 		LL_WARNS() << "Could not find font size for Pie menu, falling back to Small font." << LL_ENDL;
-		mFont=LLFontGL::getFont(LLFontDescriptor("SansSerif","Small",LLFontGL::NORMAL));
+		mFont = LLFontGL::getFont(LLFontDescriptor("SansSerif", "Small", LLFontGL::NORMAL));
 	}
 	// set slices pointer to our own slices
-	mSlices=&mMySlices;
+	mSlices = &mMySlices;
 	// this will be the first click on the menu
-	mFirstClick=TRUE;
+	mFirstClick = true;
 
 	// clean initialisation
-	mSlice=0;
+	mSlice = NULL;
 }
 
-bool PieMenu::addChild(LLView* child,S32 tab_group)
+bool PieMenu::addChild(LLView* child, S32 tab_group)
 {
 	// don't add invalid slices
-	if(!child)
+	if (!child)
+	{
 		return FALSE;
+	}
 
 	// add a new slice to the menu
 	mSlices->push_back(child);
 
 	// tell the view that our menu has changed and reshape it back to correct size
 	LLUICtrl::addChild(child);
-	reshape(PIE_OUTER_SIZE*2,PIE_OUTER_SIZE*2,FALSE);
+	reshape(PIE_OUTER_SIZE * 2, PIE_OUTER_SIZE * 2, FALSE);
+
 	return TRUE;
 }
 
 void PieMenu::removeChild(LLView* child)
 {
 	// remove a slice from the menu
-	slice_list_t::iterator found_it=std::find(mSlices->begin(),mSlices->end(),child);
-	if(found_it!=mSlices->end())
+	slice_list_t::iterator found_it = std::find(mSlices->begin(), mSlices->end(), child);
+	if (found_it != mSlices->end())
 	{
 		mSlices->erase(found_it);
 	}
 
 	// tell the view that our menu has changed and reshape it back to correct size
 	LLUICtrl::removeChild(child);
-	reshape(PIE_OUTER_SIZE*2,PIE_OUTER_SIZE*2,FALSE);
+	reshape(PIE_OUTER_SIZE * 2, PIE_OUTER_SIZE * 2, FALSE);
 }
 
-BOOL PieMenu::handleHover(S32 x,S32 y,MASK mask)
+BOOL PieMenu::handleHover(S32 x, S32 y, MASK mask)
 {
 	// do nothing
 	return TRUE;
@@ -116,8 +117,10 @@ BOOL PieMenu::handleHover(S32 x,S32 y,MASK mask)
 void PieMenu::show(S32 x, S32 y, LLView* spawning_view)
 {
 	// if the menu is already there, do nothing
-	if(getVisible())
+	if (getVisible())
+	{
 		return;
+	}
 
 	// play a sound
 	make_ui_sound("UISndPieMenuAppear");
@@ -125,41 +128,49 @@ void PieMenu::show(S32 x, S32 y, LLView* spawning_view)
 	LL_DEBUGS() << "PieMenu::show(): " << x << " " << y << LL_ENDL;
 
 	// make sure the menu is always the correct size
-	reshape(PIE_OUTER_SIZE*2,PIE_OUTER_SIZE*2,FALSE);
+	reshape(PIE_OUTER_SIZE * 2, PIE_OUTER_SIZE * 2, FALSE);
 
 	// remember our center point
-	mCenterX=x;
-	mCenterY=y;
+	mCenterX = x;
+	mCenterY = y;
 
 	// get the 3D view rectangle
-	LLRect screen=LLMenuGL::sMenuContainer->getMenuRect();
+	LLRect screen = LLMenuGL::sMenuContainer->getMenuRect();
 
 	// check if the pie menu is out of bounds and move it accordingly
-	if(x-PIE_OUTER_SIZE<0)
-		x=PIE_OUTER_SIZE;
-	else if(x+PIE_OUTER_SIZE>screen.getWidth())
-		x=screen.getWidth()-PIE_OUTER_SIZE;
+	if (x - PIE_OUTER_SIZE < 0)
+	{
+		x = PIE_OUTER_SIZE;
+	}
+	else if (x + PIE_OUTER_SIZE > screen.getWidth())
+	{
+		x = screen.getWidth() - PIE_OUTER_SIZE;
+	}
 
-	if(y-PIE_OUTER_SIZE<screen.mBottom)
-		y=PIE_OUTER_SIZE+screen.mBottom;
-	else if(y+PIE_OUTER_SIZE-screen.mBottom>screen.getHeight())
-		y=screen.getHeight()-PIE_OUTER_SIZE+screen.mBottom;
+	if (y - PIE_OUTER_SIZE < screen.mBottom)
+	{
+		y = PIE_OUTER_SIZE + screen.mBottom;
+	}
+	else if (y + PIE_OUTER_SIZE - screen.mBottom > screen.getHeight())
+	{
+		y = screen.getHeight() - PIE_OUTER_SIZE + screen.mBottom;
+	}
 
 	// move the mouse pointer into the center of the menu
-	LLUI::setMousePositionLocal(getParent(),x,y);
+	LLUI::setMousePositionLocal(getParent(), x, y);
 	// set our drawing origin to the center of the menu, taking UI scale into account
-	LLVector2 scale=gViewerWindow->getDisplayScale();
-	setOrigin(x-PIE_OUTER_SIZE/scale.mV[VX],y-PIE_OUTER_SIZE/scale.mV[VY]);
+	LLVector2 scale = gViewerWindow->getDisplayScale();
+	setOrigin(x - PIE_OUTER_SIZE / scale.mV[VX], y - PIE_OUTER_SIZE / scale.mV[VY]);
 	// grab mouse control
 	gFocusMgr.setMouseCapture(this);
 
 	// this was the first click for the menu
-	mFirstClick=TRUE;
+	mFirstClick = true;
 	// set up the slices pointer to the menu's own slices
-	mSlices=&mMySlices;
+	mSlices = &mMySlices;
 
 	// reset enable update checks for slices
-	for (slice_list_t::iterator it = mSlices->begin(); it != mSlices->end(); it++)
+	for (slice_list_t::iterator it = mSlices->begin(); it != mSlices->end(); ++it)
 	{
 		PieSlice* resetSlice = dynamic_cast<PieSlice*>(*it);
 		if (resetSlice)
@@ -169,8 +180,8 @@ void PieMenu::show(S32 x, S32 y, LLView* spawning_view)
 	}
 
 	// cleanup
-	mSlice=0;
-	mOldSlice=0;
+	mSlice = NULL;
+	mOldSlice = NULL;
 
 	// draw the menu on screen
 	setVisible(TRUE);
@@ -180,15 +191,17 @@ void PieMenu::show(S32 x, S32 y, LLView* spawning_view)
 void PieMenu::hide()
 {
 	// if the menu is already hidden, do nothing
-	if(!getVisible())
+	if (!getVisible())
+	{
 		return;
+	}
 
 	// make a sound when hiding
 	make_ui_sound("UISndPieMenuHide");
 
 	LL_DEBUGS() << "Clearing selections" << LL_ENDL;
 
-	mSlices=&mMySlices;
+	mSlices = &mMySlices;
 #if PIE_POPUP_EFFECT
 	// safety in case the timer was still running
 	mPopupTimer.stop();
@@ -199,7 +212,7 @@ void PieMenu::hide()
 void PieMenu::setVisible(BOOL visible)
 {
 	// hide the menu if needed
-	if(!visible)
+	if (!visible)
 	{
 		hide();
 		// clear all menus and temporary selections
@@ -207,37 +220,37 @@ void PieMenu::setVisible(BOOL visible)
 	}
 }
 
-void PieMenu::draw( void )
+void PieMenu::draw()
 {
 	// save the current OpenGL drawing matrix so we can freely modify it
 	gGL.pushMatrix();
 
 	// save the widget's rectangle for later use
-	LLRect r=getRect();
+	LLRect r = getRect();
 
 	// initialize pie scale factor for popup effect
-	F32 factor=1.f;
+	F32 factor = 1.f;
 
 #if PIE_POPUP_EFFECT
 	// set the popup size if this was the first click on the menu
-	if(mFirstClick)
+	if (mFirstClick)
 	{
-		factor=PIE_POPUP_FACTOR;
+		factor = PIE_POPUP_FACTOR;
 	}
 	// otherwise check if the popup timer is still running
-	else if(mPopupTimer.getStarted())
+	else if (mPopupTimer.getStarted())
 	{
 		// if the timer ran past the popup time, stop the timer and set the size to 1.0
-		F32 elapsedTime=mPopupTimer.getElapsedTimeF32();
-		if(elapsedTime>PIE_POPUP_TIME)
+		F32 elapsedTime = mPopupTimer.getElapsedTimeF32();
+		if (elapsedTime > PIE_POPUP_TIME)
 		{
-			factor=1.f;
+			factor = 1.f;
 			mPopupTimer.stop();
 		}
 		// otherwise calculate the size factor to make the menu shrink over time
 		else
 		{
-			factor=PIE_POPUP_FACTOR-(PIE_POPUP_FACTOR-1.f)*elapsedTime/PIE_POPUP_TIME;
+			factor = PIE_POPUP_FACTOR - (PIE_POPUP_FACTOR - 1.f) * elapsedTime / PIE_POPUP_TIME;
 		}
 //		setRect(r);  // obsolete?
 	}
@@ -245,15 +258,15 @@ void PieMenu::draw( void )
 
 #if PIE_DRAW_BOUNDING_BOX
 	// draw a bounding box around the menu for debugging purposes
-	gl_rect_2d(0,r.getHeight(),r.getWidth(),0,LLColor4::white,FALSE);
+	gl_rect_2d(0, r.getHeight(), r.getWidth(), 0, LLColor4::white, FALSE);
 #endif
 
 	// set up pie menu colors
-	LLColor4 lineColor=LLUIColorTable::instance().getColor("PieMenuLineColor");
-	LLColor4 selectedColor=LLUIColorTable::instance().getColor("PieMenuSelectedColor");
-	LLColor4 textColor=LLUIColorTable::instance().getColor("PieMenuTextColor");
-	LLColor4 bgColor=LLUIColorTable::instance().getColor("PieMenuBgColor");
-	LLColor4 borderColor=bgColor % (F32)0.3f;
+	LLColor4 lineColor = LLUIColorTable::instance().getColor("PieMenuLineColor");
+	LLColor4 selectedColor = LLUIColorTable::instance().getColor("PieMenuSelectedColor");
+	LLColor4 textColor = LLUIColorTable::instance().getColor("PieMenuTextColor");
+	LLColor4 bgColor = LLUIColorTable::instance().getColor("PieMenuBgColor");
+	LLColor4 borderColor = bgColor % 0.3f;
 
 	// if the user wants their own colors, apply them here
 	static LLCachedControl<bool> sOverridePieColors(gSavedSettings, "OverridePieColors", false);
@@ -261,84 +274,88 @@ void PieMenu::draw( void )
 	{
 		static LLCachedControl<F32> sPieMenuOpacity(gSavedSettings, "PieMenuOpacity");
 		static LLCachedControl<F32> sPieMenuFade(gSavedSettings, "PieMenuFade");
-		bgColor=LLUIColorTable::instance().getColor("PieMenuBgColorOverride") % sPieMenuOpacity;
-		borderColor=bgColor % (1.f - sPieMenuFade);
-		selectedColor=LLUIColorTable::instance().getColor("PieMenuSelectedColorOverride");
+		bgColor = LLUIColorTable::instance().getColor("PieMenuBgColorOverride") % sPieMenuOpacity;
+		borderColor = bgColor % (1.f - sPieMenuFade);
+		selectedColor = LLUIColorTable::instance().getColor("PieMenuSelectedColorOverride");
 	}
 
 	// on first click, make the menu fade out to indicate "borderless" operation
-	if(mFirstClick)
-		borderColor%=0.f;
+	if (mFirstClick)
+	{
+		borderColor %= 0.f;
+	}
 
 	// initially, the current segment is marked as invalid
-	S32 currentSegment=-1;
+	S32 currentSegment = -1;
 
 	// get the current mouse pointer position local to the pie
-	S32 x,y;
-	LLUI::getMousePositionLocal(this,&x,&y);
+	S32 x, y;
+	LLUI::getMousePositionLocal(this, &x, &y);
 	// remember to take the UI scaling into account
-	LLVector2 scale=gViewerWindow->getDisplayScale();
+	LLVector2 scale = gViewerWindow->getDisplayScale();
 	// move mouse coordinates to be relative to the pie center
-	LLVector2 mouseVector(x-PIE_OUTER_SIZE/scale.mV[VX],y-PIE_OUTER_SIZE/scale.mV[VY]);
+	LLVector2 mouseVector(x - PIE_OUTER_SIZE / scale.mV[VX], y - PIE_OUTER_SIZE / scale.mV[VY]);
 
 	// get the distance from the center point
-	F32 distance=mouseVector.length();
+	F32 distance = mouseVector.length();
 	// check if our mouse pointer is within the pie slice area
-	if(distance>PIE_INNER_SIZE && (distance<(PIE_OUTER_SIZE*factor) || mFirstClick))
+	if (distance > PIE_INNER_SIZE && (distance < (PIE_OUTER_SIZE * factor) || mFirstClick))
 	{
 		// get the angle of the mouse pointer from the center in radians
-		F32 angle=acos(mouseVector.mV[VX]/distance);
+		F32 angle = acos(mouseVector.mV[VX] / distance);
 		// if the mouse is below the middle of the pie, reverse the angle
-		if(mouseVector.mV[VY]<0)
-			angle=F_PI*2-angle;
+		if (mouseVector.mV[VY] < 0)
+		{
+			angle = F_PI * 2 - angle;
+		}
 		// rotate the angle slightly so the slices' centers are aligned correctly
-		angle+=F_PI/8;
+		angle += F_PI / 8;
 
 		// calculate slice number from the angle
-		currentSegment=(S32) (8.f*angle/(F_PI*2.f)) % 8;
+		currentSegment = (S32) (8.f * angle / (F_PI * 2.f)) % 8;
 	}
 
 	// move origin point to the center of our rectangle
 	gGL.translatef(r.getWidth() / 2, r.getHeight() / 2, 0);
 
 	// draw the general pie background
-	gl_washer_2d(PIE_OUTER_SIZE*factor,PIE_INNER_SIZE,32,bgColor,borderColor);
+	gl_washer_2d(PIE_OUTER_SIZE * factor, PIE_INNER_SIZE, 32, bgColor, borderColor);
 
 	// set up an item list iterator to point at the beginning of the item list
 	slice_list_t::iterator cur_item_iter;
-	cur_item_iter=mSlices->begin();
+	cur_item_iter = mSlices->begin();
 
 	// clear current slice pointer
-	mSlice=0;
+	mSlice = NULL;
 	// current slice number is 0
-	S32 num=0;
-	BOOL wasAutohide=FALSE;
+	S32 num = 0;
+	bool wasAutohide = false;
 	do
 	{
 		// standard item text color
-		LLColor4 itemColor=textColor;
+		LLColor4 itemColor = textColor;
 
 		// clear the label and set up the starting angle to draw in
 		std::string label("");
-		F32 segmentStart = F_PI/4.f * (F32)num - F_PI / 8.f;
+		F32 segmentStart = F_PI / 4.f * (F32)num - F_PI / 8.f;
 
 		// iterate through the list of slices
-		if(cur_item_iter!=mSlices->end())
+		if (cur_item_iter != mSlices->end())
 		{
 			// get current slice item
-			LLView* item=(*cur_item_iter);
+			LLView* item = (*cur_item_iter);
 
 			// check if this is a submenu or a normal click slice
-			PieSlice* currentSlice=dynamic_cast<PieSlice*>(item);
-			PieMenu* currentSubmenu=dynamic_cast<PieMenu*>(item);
+			PieSlice* currentSlice = dynamic_cast<PieSlice*>(item);
+			PieMenu* currentSubmenu = dynamic_cast<PieMenu*>(item);
 			// advance internally to the next slice item
 			cur_item_iter++;
 
 			// in case it is regular click slice
-			if(currentSlice)
+			if (currentSlice)
 			{
 				// get the slice label and tell the slice to check if it's supposed to be visible
-				label=currentSlice->getLabel();
+				label = currentSlice->getLabel();
 				currentSlice->updateVisible();
 				// disable it if it's not visible, pie slices never really disappear
 				BOOL slice_visible = currentSlice->getVisible();
@@ -350,68 +367,81 @@ void PieMenu::draw( void )
 				}
 
 				// if the current slice is the start of an autohide chain, clear out previous chains
-				if(currentSlice->getStartAutohide())
-					wasAutohide=FALSE;
+				if (currentSlice->getStartAutohide())
+				{
+					wasAutohide = false;
+				}
 
 				// check if the current slice is part of an autohide chain
-				if(currentSlice->getAutohide())
+				if (currentSlice->getAutohide())
 				{
 					// if the previous item already won the autohide, skip this item
-					if(wasAutohide)
+					if (wasAutohide)
+					{
 						continue;
+					}
+
 					// look at the next item in the pie
-					LLView* lookAhead=(*cur_item_iter);
+					LLView* lookAhead = (*cur_item_iter);
 					// check if this is a normal click slice
-					PieSlice* lookSlice=dynamic_cast<PieSlice*>(lookAhead);
-					if(lookSlice)
+					PieSlice* lookSlice = dynamic_cast<PieSlice*>(lookAhead);
+					if (lookSlice)
 					{
 						// if the next item is part of the current autohide chain as well ...
-						if(lookSlice->getAutohide() && !lookSlice->getStartAutohide())
+						if (lookSlice->getAutohide() && !lookSlice->getStartAutohide())
 						{
 							// ... it's visible and it's enabled, skip the current one.
 							// the first visible and enabled item in autohide chains wins
 							// this is useful for Sit/Stand toggles
 							lookSlice->updateEnabled();
 							lookSlice->updateVisible();
-							if(lookSlice->getVisible() && lookSlice->getEnabled())
+							if (lookSlice->getVisible() && lookSlice->getEnabled())
+							{
 								continue;
+							}
+
 							// this item won the autohide contest
-							wasAutohide=TRUE;
+							wasAutohide = true;
 						}
 					}
 				}
 				else
+				{
 					// reset autohide chain
-					wasAutohide=FALSE;
+					wasAutohide = false;
+				}
+
 				// check if the slice is currently enabled
 				currentSlice->updateEnabled();
-				if(!currentSlice->getEnabled())
+				if (!currentSlice->getEnabled())
 				{
 					LL_DEBUGS() << label << " is disabled" << LL_ENDL;
 					// fade the item color alpha to mark the item as disabled
-					itemColor%=(F32)0.3f;
+					itemColor %= 0.3f;
 				}
 			}
 			// if it's a submenu just get the label
-			else if(currentSubmenu)
-				label=currentSubmenu->getLabel();
+			else if (currentSubmenu)
+			{
+				label = currentSubmenu->getLabel();
+			}
 
 			// if it's a slice or submenu, the mouse pointer is over the same segment as our counter and the item is enabled
-			if((currentSlice || currentSubmenu) && (currentSegment==num) && item->getEnabled())
+			if ((currentSlice || currentSubmenu) && (currentSegment==num) && item->getEnabled())
 			{
 				// memorize the currently highlighted slice for later
-				mSlice=item;
+				mSlice = item;
 				// if we highlighted a different slice than before, we must play a sound
-				if(mOldSlice!=mSlice)
+				if (mOldSlice != mSlice)
 				{
 					// get the appropriate UI sound and play it
-					char soundNum='0'+num;
-					std::string soundName="UISndPieMenuSliceHighlight";
-					soundName+=soundNum;
+					char soundNum = '0' + num;
+					std::string soundName = "UISndPieMenuSliceHighlight";
+					soundName += soundNum;
 
 					make_ui_sound(soundName.c_str());
 					// remember which slice we highlighted last, so we only play the sound once
-					mOldSlice=mSlice;
+					mOldSlice = mSlice;
 				}
 
 				// draw the currently highlighted pie slice
@@ -434,12 +464,14 @@ void PieMenu::draw( void )
 		// next slice
 		num++;
 	}
-	while(num<8);	// do this until the menu is full
+	while (num < 8);	// do this until the menu is full
 
 	// draw inner and outer circle, outer only if it was not the first click
-	if(!mFirstClick)
+	if (!mFirstClick)
+	{
 		gl_washer_2d(PIE_OUTER_SIZE * factor, PIE_OUTER_SIZE * factor - 2.f, 32, lineColor, borderColor);
-	gl_washer_2d(PIE_INNER_SIZE+1,PIE_INNER_SIZE-1,16,borderColor,lineColor);
+	}
+	gl_washer_2d(PIE_INNER_SIZE + 1, PIE_INNER_SIZE - 1, 16, borderColor, lineColor);
 
 	// restore OpenGL drawing matrix
 	gGL.popMatrix();
@@ -451,8 +483,10 @@ void PieMenu::draw( void )
 BOOL PieMenu::appendContextSubMenu(PieMenu* menu)
 {
 	LL_DEBUGS() << "PieMenu::appendContextSubMenu()" << LL_ENDL;
-	if(!menu)
+	if (!menu)
+	{
 		return FALSE;
+	}
 
 	LL_DEBUGS() << "PieMenu::appendContextSubMenu() appending " << menu->getLabel() << " to " << getLabel() << LL_ENDL;
 
@@ -460,28 +494,29 @@ BOOL PieMenu::appendContextSubMenu(PieMenu* menu)
 	mSlices->push_back(menu);
 	// tell the view that our menu has changed
 	LLUICtrl::addChild(menu);
+
 	return TRUE;
 }
 
-BOOL PieMenu::handleMouseUp(S32 x,S32 y,MASK mask)
+BOOL PieMenu::handleMouseUp(S32 x, S32 y, MASK mask)
 {
 	// left and right mouse buttons both do the same thing currently
-	return handleMouseButtonUp(x,y,mask);
+	return handleMouseButtonUp(x, y, mask);
 }
 
-BOOL PieMenu::handleRightMouseUp(S32 x,S32 y,MASK mask)
+BOOL PieMenu::handleRightMouseUp(S32 x, S32 y, MASK mask)
 {
 	// left and right mouse buttons both do the same thing currently
-	return handleMouseButtonUp(x,y,mask);
+	return handleMouseButtonUp(x, y, mask);
 }
 
 // left and right mouse buttons both do the same thing currently
-BOOL PieMenu::handleMouseButtonUp(S32 x,S32 y,MASK mask)
+BOOL PieMenu::handleMouseButtonUp(S32 x, S32 y, MASK mask)
 {
 	// if this was the first click and no slice is highlighted (no borderless click), start the popup timer
-	if(mFirstClick && !mSlice)
+	if (mFirstClick && !mSlice)
 	{
-		mFirstClick=FALSE;
+		mFirstClick = false;
 #if PIE_POPUP_EFFECT
 		mPopupTimer.start();
 #endif
@@ -489,11 +524,11 @@ BOOL PieMenu::handleMouseButtonUp(S32 x,S32 y,MASK mask)
 	else
 	{
 		// default to invisible
-		BOOL visible=FALSE;
+		BOOL visible = FALSE;
 
 		// get the current selected slice and check if this is a regular click slice
-		PieSlice* currentSlice=dynamic_cast<PieSlice*>(mSlice);
-		if(currentSlice)
+		PieSlice* currentSlice = dynamic_cast<PieSlice*>(mSlice);
+		if (currentSlice)
 		{
 			// if so, click it and make a sound
 			make_ui_sound("UISndClickRelease");
@@ -502,15 +537,15 @@ BOOL PieMenu::handleMouseButtonUp(S32 x,S32 y,MASK mask)
 		else
 		{
 			// check if this was a submenu
-			PieMenu* currentSubmenu=dynamic_cast<PieMenu*>(mSlice);
-			if(currentSubmenu)
+			PieMenu* currentSubmenu = dynamic_cast<PieMenu*>(mSlice);
+			if (currentSubmenu)
 			{
 				// if so, remember we clicked the menu already at least once
-				mFirstClick=FALSE;
+				mFirstClick = false;
 				// swap out the list of items for the ones in the submenu
-				mSlices=&currentSubmenu->mMySlices;
+				mSlices = &currentSubmenu->mMySlices;
 				// reset enable update checks for slices
-				for (slice_list_t::iterator it = mSlices->begin(); it != mSlices->end(); it++)
+				for (slice_list_t::iterator it = mSlices->begin(); it != mSlices->end(); ++it)
 				{
 					PieSlice* resetSlice = dynamic_cast<PieSlice*>(*it);
 					if (resetSlice)
@@ -519,7 +554,7 @@ BOOL PieMenu::handleMouseButtonUp(S32 x,S32 y,MASK mask)
 					}
 				}
 				// the menu stays visible
-				visible=TRUE;
+				visible = TRUE;
 #if PIE_POPUP_EFFECT
 				// restart the popup timer
 				mPopupTimer.reset();
@@ -533,9 +568,11 @@ BOOL PieMenu::handleMouseButtonUp(S32 x,S32 y,MASK mask)
 		setVisible(visible);
 	}
 	// release mouse capture after the first click if we still have it grabbed
-	if(hasMouseCapture())
+	if (hasMouseCapture())
+	{
 		gFocusMgr.setMouseCapture(NULL);
+	}
 
 	// give control back to the system
-	return LLView::handleMouseUp(x,y,mask);
+	return LLView::handleMouseUp(x, y, mask);
 }
diff --git a/indra/newview/piemenu.h b/indra/newview/piemenu.h
index 3b1096c9b6..aebe78a52a 100644
--- a/indra/newview/piemenu.h
+++ b/indra/newview/piemenu.h
@@ -45,7 +45,7 @@ class PieMenu : public LLContextMenu
 
 			Params()
 			{
-				visible=false;
+				visible = false;
 			}
 		};
 
@@ -57,7 +57,7 @@ class PieMenu : public LLContextMenu
 		/*virtual*/ void setVisible(BOOL visible);
 
 		// adding and removing "child" slices to the pie
-		/*virtual*/ bool addChild(LLView* child,S32 tab_group=0);
+		/*virtual*/ bool addChild(LLView* child, S32 tab_group = 0);
 		/*virtual*/ void removeChild(LLView* child);
 
 		/*virtual*/ BOOL handleHover(S32 x,S32 y,MASK mask);
@@ -90,7 +90,7 @@ class PieMenu : public LLContextMenu
 
 	protected:
 		// general mouse button handling
-		BOOL handleMouseButtonUp(S32 x,S32 y,MASK mask);
+		BOOL handleMouseButtonUp(S32 x, S32 y, MASK mask);
 		// font used for the menu
 		const LLFontGL* mFont;
 		// currently highlighted item, must be tested if it's a slice or submenu
@@ -104,7 +104,7 @@ class PieMenu : public LLContextMenu
 		S32 mCenterX;
 		S32 mCenterY;
 		// this is TRUE when the first mouseclick came to display the menu, used for borderless menu
-		BOOL mFirstClick;
+		bool mFirstClick;
 };
 
 #endif // PIEMENU_H
diff --git a/indra/newview/pieseparator.cpp b/indra/newview/pieseparator.cpp
index a1621417e7..b20cdca5fc 100644
--- a/indra/newview/pieseparator.cpp
+++ b/indra/newview/pieseparator.cpp
@@ -26,7 +26,6 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-#include "linden_common.h"
 
 #include "pieseparator.h"
 
@@ -40,5 +39,5 @@ PieSeparator::PieSeparator(const PieSeparator::Params& p) :
 // pick up parameters from the XUI definition
 PieSeparator::Params::Params()
 {
-	name="pie_separator";
+	name = "pie_separator";
 }
diff --git a/indra/newview/pieseparator.h b/indra/newview/pieseparator.h
index 376fa0c334..17c0e059f8 100644
--- a/indra/newview/pieseparator.h
+++ b/indra/newview/pieseparator.h
@@ -28,7 +28,6 @@
 #ifndef PIESEPARATOR_H
 #define PIESEPARATOR_H
 
-#include "llinitparam.h"
 #include "lluictrl.h"
 
 // a pie slice that does nothing and is not highlighting by mouse hover
diff --git a/indra/newview/pieslice.cpp b/indra/newview/pieslice.cpp
index 5a1a336a02..c4041aada2 100644
--- a/indra/newview/pieslice.cpp
+++ b/indra/newview/pieslice.cpp
@@ -47,9 +47,9 @@ PieSlice::Params::Params() :
 	on_click("on_click"),
 	on_visible("on_visible"),
 	on_enable("on_enable"),
-	start_autohide("start_autohide",FALSE),
-	autohide("autohide",FALSE),
-	check_enable_once("check_enable_once",FALSE)
+	start_autohide("start_autohide", FALSE),
+	autohide("autohide", FALSE),
+	check_enable_once("check_enable_once", FALSE)
 {
 }
 
@@ -57,7 +57,7 @@ PieSlice::Params::Params() :
 void PieSlice::initFromParams(const Params& p)
 {
 	// add a callback if on_click is provided
-	if(p.on_click.isProvided())
+	if (p.on_click.isProvided())
 	{
 		setCommitCallback(initCommitCallback(p.on_click));
 	}
@@ -87,12 +87,12 @@ void PieSlice::initFromParams(const Params& p)
 // call this to make the menu update its "enabled" status
 void PieSlice::updateEnabled()
 {
-	if(mDoUpdateEnabled && mEnableSignal.num_slots()>0)
+	if (mDoUpdateEnabled && mEnableSignal.num_slots() > 0)
 	{
-		bool enabled=mEnableSignal(this,LLSD());
-		if(mEnabledControlVariable)
+		bool enabled = mEnableSignal(this, LLSD());
+		if (mEnabledControlVariable)
 		{
-			if(!enabled)
+			if (!enabled)
 			{
 				// callback overrides control variable; this will call setEnabled()
 				mEnabledControlVariable->set(false);
@@ -110,9 +110,9 @@ void PieSlice::updateEnabled()
 // call this to make the menu update its "visible" status
 void PieSlice::updateVisible()
 {
-	if(mVisibleSignal.num_slots()>0)
+	if (mVisibleSignal.num_slots() > 0)
 	{
-		bool visible=mVisibleSignal(this,LLSD());
+		bool visible = mVisibleSignal(this, LLSD());
 		setVisible(visible);
 	}
 }
@@ -138,7 +138,7 @@ std::string PieSlice::getLabel() const
 // accessor
 void PieSlice::setLabel(const std::string newLabel)
 {
-	mLabel=newLabel;
+	mLabel = newLabel;
 }
 
 // accessor
diff --git a/indra/newview/pieslice.h b/indra/newview/pieslice.h
index e20784372d..692016b3df 100644
--- a/indra/newview/pieslice.h
+++ b/indra/newview/pieslice.h
@@ -28,9 +28,6 @@
 #ifndef PIESLICE_H
 #define PIESLICE_H
 
-#include <boost/signals2.hpp>
-
-#include "llinitparam.h"
 #include "lluictrl.h"
 
 // A slice in the pie. Does nothing by itself, just stores the function and

From 09e83c035718bea3ff5e0c3b96cc9efc1e9dd14c Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 10 Dec 2014 14:15:23 +0100
Subject: [PATCH 170/229] FIRE-1279: Proposed fix for pie menu being active
 while hidden behind another application

---
 indra/newview/piemenu.cpp | 130 +++++++++++++++++++++-----------------
 indra/newview/piemenu.h   |   4 ++
 2 files changed, 75 insertions(+), 59 deletions(-)

diff --git a/indra/newview/piemenu.cpp b/indra/newview/piemenu.cpp
index bad5f9ab87..28d43dde08 100644
--- a/indra/newview/piemenu.cpp
+++ b/indra/newview/piemenu.cpp
@@ -55,7 +55,8 @@ const S32 PIE_X[] = {64, 45,  0, -45, -63, -45,   0,  45};
 const S32 PIE_Y[] = { 0, 44, 73,  44,   0, -44, -73, -44};
 
 PieMenu::PieMenu(const LLContextMenu::Params& p) :
-	LLContextMenu(p)
+	LLContextMenu(p),
+	mCurrentSegment(-1)
 {
 	LL_DEBUGS() << "PieMenu::PieMenu()" << LL_ENDL;
 	// radius, so we need this *2
@@ -110,7 +111,37 @@ void PieMenu::removeChild(LLView* child)
 
 BOOL PieMenu::handleHover(S32 x, S32 y, MASK mask)
 {
-	// do nothing
+	// initialize pie scale factor for popup effect
+	F32 factor = getScaleFactor();
+
+	// initially, the current segment is marked as invalid
+	mCurrentSegment = -1;
+
+	// remember to take the UI scaling into account
+	LLVector2 scale = gViewerWindow->getDisplayScale();
+	// move mouse coordinates to be relative to the pie center
+	LLVector2 mouseVector(x - PIE_OUTER_SIZE / scale.mV[VX], y - PIE_OUTER_SIZE / scale.mV[VY]);
+
+	// get the distance from the center point
+	F32 distance = mouseVector.length();
+
+	// check if our mouse pointer is within the pie slice area
+	if (distance > PIE_INNER_SIZE && (distance < (PIE_OUTER_SIZE * factor) || mFirstClick))
+	{
+		// get the angle of the mouse pointer from the center in radians
+		F32 angle = acos(mouseVector.mV[VX] / distance);
+		// if the mouse is below the middle of the pie, reverse the angle
+		if (mouseVector.mV[VY] < 0)
+		{
+			angle = F_PI * 2 - angle;
+		}
+		// rotate the angle slightly so the slices' centers are aligned correctly
+		angle += F_PI / 8;
+
+		// calculate slice number from the angle
+		mCurrentSegment = (S32) (8.f * angle / (F_PI * 2.f)) % 8;
+	}
+
 	return TRUE;
 }
 
@@ -122,6 +153,8 @@ void PieMenu::show(S32 x, S32 y, LLView* spawning_view)
 		return;
 	}
 
+	mCurrentSegment = -1;
+
 	// play a sound
 	make_ui_sound("UISndPieMenuAppear");
 
@@ -201,6 +234,7 @@ void PieMenu::hide()
 
 	LL_DEBUGS() << "Clearing selections" << LL_ENDL;
 
+	mCurrentSegment = -1;
 	mSlices = &mMySlices;
 #if PIE_POPUP_EFFECT
 	// safety in case the timer was still running
@@ -229,32 +263,7 @@ void PieMenu::draw()
 	LLRect r = getRect();
 
 	// initialize pie scale factor for popup effect
-	F32 factor = 1.f;
-
-#if PIE_POPUP_EFFECT
-	// set the popup size if this was the first click on the menu
-	if (mFirstClick)
-	{
-		factor = PIE_POPUP_FACTOR;
-	}
-	// otherwise check if the popup timer is still running
-	else if (mPopupTimer.getStarted())
-	{
-		// if the timer ran past the popup time, stop the timer and set the size to 1.0
-		F32 elapsedTime = mPopupTimer.getElapsedTimeF32();
-		if (elapsedTime > PIE_POPUP_TIME)
-		{
-			factor = 1.f;
-			mPopupTimer.stop();
-		}
-		// otherwise calculate the size factor to make the menu shrink over time
-		else
-		{
-			factor = PIE_POPUP_FACTOR - (PIE_POPUP_FACTOR - 1.f) * elapsedTime / PIE_POPUP_TIME;
-		}
-//		setRect(r);  // obsolete?
-	}
-#endif
+	F32 factor = getScaleFactor();
 
 #if PIE_DRAW_BOUNDING_BOX
 	// draw a bounding box around the menu for debugging purposes
@@ -285,36 +294,6 @@ void PieMenu::draw()
 		borderColor %= 0.f;
 	}
 
-	// initially, the current segment is marked as invalid
-	S32 currentSegment = -1;
-
-	// get the current mouse pointer position local to the pie
-	S32 x, y;
-	LLUI::getMousePositionLocal(this, &x, &y);
-	// remember to take the UI scaling into account
-	LLVector2 scale = gViewerWindow->getDisplayScale();
-	// move mouse coordinates to be relative to the pie center
-	LLVector2 mouseVector(x - PIE_OUTER_SIZE / scale.mV[VX], y - PIE_OUTER_SIZE / scale.mV[VY]);
-
-	// get the distance from the center point
-	F32 distance = mouseVector.length();
-	// check if our mouse pointer is within the pie slice area
-	if (distance > PIE_INNER_SIZE && (distance < (PIE_OUTER_SIZE * factor) || mFirstClick))
-	{
-		// get the angle of the mouse pointer from the center in radians
-		F32 angle = acos(mouseVector.mV[VX] / distance);
-		// if the mouse is below the middle of the pie, reverse the angle
-		if (mouseVector.mV[VY] < 0)
-		{
-			angle = F_PI * 2 - angle;
-		}
-		// rotate the angle slightly so the slices' centers are aligned correctly
-		angle += F_PI / 8;
-
-		// calculate slice number from the angle
-		currentSegment = (S32) (8.f * angle / (F_PI * 2.f)) % 8;
-	}
-
 	// move origin point to the center of our rectangle
 	gGL.translatef(r.getWidth() / 2, r.getHeight() / 2, 0);
 
@@ -427,7 +406,7 @@ void PieMenu::draw()
 			}
 
 			// if it's a slice or submenu, the mouse pointer is over the same segment as our counter and the item is enabled
-			if ((currentSlice || currentSubmenu) && (currentSegment==num) && item->getEnabled())
+			if ((currentSlice || currentSubmenu) && (mCurrentSegment == num) && item->getEnabled())
 			{
 				// memorize the currently highlighted slice for later
 				mSlice = item;
@@ -576,3 +555,36 @@ BOOL PieMenu::handleMouseButtonUp(S32 x, S32 y, MASK mask)
 	// give control back to the system
 	return LLView::handleMouseUp(x, y, mask);
 }
+
+F32 PieMenu::getScaleFactor()
+{
+	// initialize pie scale factor for popup effect
+	F32 factor = 1.f;
+
+#if PIE_POPUP_EFFECT
+	// set the popup size if this was the first click on the menu
+	if (mFirstClick)
+	{
+		factor = PIE_POPUP_FACTOR;
+	}
+	// otherwise check if the popup timer is still running
+	else if (mPopupTimer.getStarted())
+	{
+		// if the timer ran past the popup time, stop the timer and set the size to 1.0
+		F32 elapsedTime = mPopupTimer.getElapsedTimeF32();
+		if (elapsedTime > PIE_POPUP_TIME)
+		{
+			factor = 1.f;
+			mPopupTimer.stop();
+		}
+		// otherwise calculate the size factor to make the menu shrink over time
+		else
+		{
+			factor = PIE_POPUP_FACTOR - (PIE_POPUP_FACTOR - 1.f) * elapsedTime / PIE_POPUP_TIME;
+		}
+//		setRect(r);  // obsolete?
+	}
+
+	return factor;
+#endif
+}
\ No newline at end of file
diff --git a/indra/newview/piemenu.h b/indra/newview/piemenu.h
index aebe78a52a..d986f740b1 100644
--- a/indra/newview/piemenu.h
+++ b/indra/newview/piemenu.h
@@ -105,6 +105,10 @@ class PieMenu : public LLContextMenu
 		S32 mCenterY;
 		// this is TRUE when the first mouseclick came to display the menu, used for borderless menu
 		bool mFirstClick;
+
+		F32 getScaleFactor();
+
+		S32 mCurrentSegment;
 };
 
 #endif // PIEMENU_H

From b24b8841225a035a090cb62c4e90c3634332f6f2 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 11 Dec 2014 11:05:24 +0100
Subject: [PATCH 171/229] FIRE-15101: Fix bottom toolbar buttons show in
 mouselook;

This fix reverts the initial fix for FIRE-5141 (e756e5e01e11) and replaces it
with a more specific one: The panel for the bottom toolbar buttons will always
stay visible regardless if it contains buttons or not, unless the whole toolbar
itself will be hidden (which happens for mouselook in case the UI should not be
shown). This means the nearby chat bar can be resized unless being in mouselook
and having UI in mouselook disabled.
---
 indra/llui/lllayoutstack.cpp                  | 36 +++++--------------
 indra/llui/lllayoutstack.h                    |  6 ----
 indra/newview/lltoolbarview.cpp               |  5 ++-
 .../ansastorm/xui/en/panel_toolbar_view.xml   |  1 -
 .../default/xui/en/panel_toolbar_view.xml     |  1 -
 .../metaharper/xui/en/panel_toolbar_view.xml  |  1 -
 .../starlight/xui/en/panel_toolbar_view.xml   |  1 -
 .../xui/en/panel_toolbar_view.xml             |  1 -
 8 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 0f2d2fbee9..3531c2cf50 100755
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -49,8 +49,7 @@ LLLayoutPanel::Params::Params()
 :	expanded_min_dim("expanded_min_dim", 0),
 	min_dim("min_dim", -1),
 	user_resize("user_resize", false),
-	auto_resize("auto_resize", true),
-	force_resize_bar("force_resize_bar", false) // <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
+	auto_resize("auto_resize", true)
 {
 	addSynonym(min_dim, "min_width");
 	addSynonym(min_dim, "min_height");
@@ -69,8 +68,7 @@ LLLayoutPanel::LLLayoutPanel(const Params& p)
 	mFractionalSize(0.f),
 	mTargetDim(0),
 	mIgnoreReshape(false),
-	mOrientation(LLLayoutStack::HORIZONTAL),
-	mForceResizeBar(p.force_resize_bar) // <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
+	mOrientation(LLLayoutStack::HORIZONTAL)
 {
 	// panels initialized as hidden should not start out partially visible
 	if (!getVisible())
@@ -476,10 +474,7 @@ void LLLayoutStack::updateLayout()
 
 		if (panelp->mAutoResize 
 			&& !panelp->mCollapsed 
-			// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
-			//&& panelp->getVisible())
-			&& (panelp->getVisible() || panelp->mForceResizeBar))
-			// </FS:Ansariel>
+			&& panelp->getVisible())
 		{
 			S32 space_for_panel = remaining_space > 0 ? 1 : -1;
 			panelp->mTargetDim += space_for_panel;
@@ -792,10 +787,7 @@ bool LLLayoutStack::animatePanels()
 	//
 	BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
 	{
-		// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
-		//if (panelp->getVisible())
-		if (panelp->getVisible() || panelp->mForceResizeBar)
-		// </FS:Ansariel>
+		if (panelp->getVisible())
 		{
 			if (mAnimate && panelp->mVisibleAmt < 1.f)
 			{
@@ -896,10 +888,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
 		if (panelp->mAutoResize)
 		{
 			old_auto_resize_headroom += (F32)(panelp->mTargetDim - panelp->getRelevantMinDim());
-			// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
-			//if (panelp->getVisible() && !panelp->mCollapsed)
-			if ((panelp->getVisible() || panelp->mForceResizeBar) && !panelp->mCollapsed)
-			// </FS:Ansariel>
+			if (panelp->getVisible() && !panelp->mCollapsed)
 			{
 				total_visible_fraction += panelp->mFractionalSize;
 			}
@@ -910,10 +899,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
 			other_resize_panel = following_panel;
 		}
 
-		// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
-		//if (panelp->getVisible() && !panelp->mCollapsed)
-		if ((panelp->getVisible() || panelp->mForceResizeBar) && !panelp->mCollapsed)
-		// </FS:Ansariel>
+		if (panelp->getVisible() && !panelp->mCollapsed)
 		{
 			following_panel = panelp;
 		}
@@ -948,10 +934,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
 
 	BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
 	{
-		// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
-		//if (!panelp->getVisible() || panelp->mCollapsed) 
-		if ((!panelp->getVisible() && !panelp->mForceResizeBar) || panelp->mCollapsed) 
-		// </FS:Ansariel>
+		if (!panelp->getVisible() || panelp->mCollapsed) 
 		{
 			if (panelp->mAutoResize) 
 			{
@@ -1059,10 +1042,7 @@ void LLLayoutStack::updateResizeBarLimits()
 	LLLayoutPanel* previous_visible_panelp = NULL;
 	BOOST_REVERSE_FOREACH(LLLayoutPanel* visible_panelp, mPanels)
 	{
-		// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
-		//if (!visible_panelp->getVisible() || visible_panelp->mCollapsed)
-		if ((!visible_panelp->getVisible() && !visible_panelp->mForceResizeBar) || visible_panelp->mCollapsed)
-		// </FS:Ansariel>
+		if (!visible_panelp->getVisible() || visible_panelp->mCollapsed)
 		{
 			visible_panelp->mResizeBar->setVisible(FALSE);
 			continue;
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index bc61a3cd65..316d05834d 100755
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -151,9 +151,6 @@ public:
 		Optional<bool>			user_resize,
 								auto_resize;
 
-		// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
-		Optional<bool>			force_resize_bar;
-
 		Params();
 	};
 
@@ -223,9 +220,6 @@ protected:
 	LLView::EOrientation mOrientation;
 	class LLResizeBar* mResizeBar;
 
-	// <FS:Ansariel> FIRE-5141: Add option to force display of a resize handle
-	bool	mForceResizeBar;
-
 	// <FS:Ansariel> Add callback for reshaping
 	reshape_panel_callback_t mReshapePanelCallback;
 };
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index b90171338b..a15c38cb84 100755
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -603,7 +603,10 @@ void LLToolBarView::draw()
 	for (S32 i = LLToolBarEnums::TOOLBAR_FIRST; i <= LLToolBarEnums::TOOLBAR_LAST; i++)
 	{
 		mToolbars[i]->getParent()->setVisible(mShowToolbars 
-											&& (mToolbars[i]->hasButtons() 
+											// <FS:Ansariel> FIRE-5141: Nearby chat floater can no longer be resized when all buttons are removed from bottom FUI panel
+											//&& (mToolbars[i]->hasButtons() 
+											&& ((i == LLToolBarEnums::TOOLBAR_BOTTOM ? true : mToolbars[i]->hasButtons())
+											// </FS:Ansariel>
 											|| isToolDragged()));
 	}
 
diff --git a/indra/newview/skins/ansastorm/xui/en/panel_toolbar_view.xml b/indra/newview/skins/ansastorm/xui/en/panel_toolbar_view.xml
index 34150e97cd..72fe9b1e8b 100644
--- a/indra/newview/skins/ansastorm/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/ansastorm/xui/en/panel_toolbar_view.xml
@@ -253,7 +253,6 @@
 
   <!-- The toolbar itself -->
   <layout_panel name="toolbar_panel"
-                force_resize_bar="true"
                 auto_resize="true"
                 user_resize="true"
                 height="30"
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 6998b7dc0d..0a9fd4b698 100755
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -251,7 +251,6 @@
 
   <!-- The toolbar itself -->
   <layout_panel name="toolbar_panel"
-                force_resize_bar="true"
                 auto_resize="true"
                 user_resize="true"
                 height="30"
diff --git a/indra/newview/skins/metaharper/xui/en/panel_toolbar_view.xml b/indra/newview/skins/metaharper/xui/en/panel_toolbar_view.xml
index 5cb39d060a..ed95d27590 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_toolbar_view.xml
@@ -255,7 +255,6 @@
 
   <!-- The toolbar itself -->
   <layout_panel name="toolbar_panel"
-                force_resize_bar="true"
                 auto_resize="true"
                 user_resize="true"
                 height="30"
diff --git a/indra/newview/skins/starlight/xui/en/panel_toolbar_view.xml b/indra/newview/skins/starlight/xui/en/panel_toolbar_view.xml
index dafd419af8..097d54cc2f 100644
--- a/indra/newview/skins/starlight/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_toolbar_view.xml
@@ -251,7 +251,6 @@
 
   <!-- The toolbar itself -->
   <layout_panel name="toolbar_panel"
-                force_resize_bar="true"
                 auto_resize="true"
                 user_resize="true"
                 height="30"
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_toolbar_view.xml b/indra/newview/skins/starlightcui/xui/en/panel_toolbar_view.xml
index 35c7defac1..aff97543dd 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_toolbar_view.xml
@@ -251,7 +251,6 @@
 
   <!-- The toolbar itself -->
   <layout_panel name="toolbar_panel"
-                force_resize_bar="true"
                 auto_resize="true"
                 user_resize="true"
                 height="30"

From e685b22be821dba4eb58f01ce486878e77903426 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 11 Dec 2014 13:26:56 +0100
Subject: [PATCH 172/229] Refactor code for showing the blocklist and route
 everything through LLPanelBlockedList::showPanelAndSelect

---
 indra/newview/fspanelblocklist.cpp    |  5 +++++
 indra/newview/fspanelblocklist.h      |  2 +-
 indra/newview/fspanelradar.cpp        | 11 ++---------
 indra/newview/llfloaterpreference.cpp | 11 ++---------
 indra/newview/llpanelblockedlist.cpp  | 20 ++++----------------
 indra/newview/llpanelblockedlist.h    |  4 +++-
 6 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/indra/newview/fspanelblocklist.cpp b/indra/newview/fspanelblocklist.cpp
index b7fa6ead61..a2a946ec1e 100644
--- a/indra/newview/fspanelblocklist.cpp
+++ b/indra/newview/fspanelblocklist.cpp
@@ -125,6 +125,11 @@ void FSPanelBlockList::selectBlocked(const LLUUID& mute_id)
 
 void FSPanelBlockList::showPanelAndSelect(const LLUUID& idToSelect)
 {
+	if (gSavedSettings.getBOOL("FSDisableBlockListAutoOpen"))
+	{
+		return;
+	}
+
 	if (gSavedSettings.getBOOL("FSUseStandaloneBlocklistFloater"))
 	{
 		LLFloaterReg::showInstance("fs_blocklist", LLSD().with(BLOCKED_PARAM_NAME, idToSelect));
diff --git a/indra/newview/fspanelblocklist.h b/indra/newview/fspanelblocklist.h
index ce7da3dcca..be4d6d2b00 100644
--- a/indra/newview/fspanelblocklist.h
+++ b/indra/newview/fspanelblocklist.h
@@ -57,7 +57,7 @@ public:
 	 *	@param idToSelect - LLUUID of blocked Resident or Object to be selected. 
 	 *			If it is LLUUID::null, nothing will be selected.
 	 */
-	static void showPanelAndSelect(const LLUUID& idToSelect);
+	static void showPanelAndSelect(const LLUUID& idToSelect = LLUUID::null);
 
 	// LLMuteListObserver callback interface implementation.
 	/* virtual */ void onChange() {	refreshBlockedList();}
diff --git a/indra/newview/fspanelradar.cpp b/indra/newview/fspanelradar.cpp
index 2ae17addd5..d0ca7d9cf9 100644
--- a/indra/newview/fspanelradar.cpp
+++ b/indra/newview/fspanelradar.cpp
@@ -43,6 +43,7 @@
 #include "llavataractions.h"
 #include "llfloatersidepanelcontainer.h"
 #include "llnetmap.h"
+#include "llpanelblockedlist.h"
 #include "llviewercontrol.h"		// for gSavedSettings
 #include "llviewermenu.h"			// for gMenuHolder
 #include "rlvhandler.h"
@@ -279,15 +280,7 @@ void FSPanelRadar::onOptionsMenuItemClicked(const LLSD& userdata)
 
 	if (chosen_item == "panel_block_list_sidetray")
 	{
-		if (gSavedSettings.getBOOL("FSUseStandaloneBlocklistFloater"))
-		{
-			LLFloaterReg::showInstance("fs_blocklist", LLSD());
-		}
-		else
-		{
-			LLFloaterSidePanelContainer::showPanel("people", "panel_people",
-				LLSD().with("people_panel_tab_name", "blocked_panel"));
-		}
+		LLPanelBlockedList::showPanelAndSelect();
 	}
 }
 
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 90a08c7927..7bd91743f8 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -123,6 +123,7 @@
 #include "lleventtimer.h"
 #include "lldiriterator.h"	// <Kadah> for populating the fonts combo
 #include "llline.h"
+#include "llpanelblockedlist.h"
 #include "llpanelmaininventory.h"
 #include "llscrolllistctrl.h"
 #include "llspellcheck.h"
@@ -2458,15 +2459,7 @@ void LLFloaterPreference::onClickBlockList()
 	// </FS:Ansariel> Optional standalone blocklist floater
 	//LLFloaterSidePanelContainer::showPanel("people", "panel_people",
 	//	LLSD().with("people_panel_tab_name", "blocked_panel"));
-	if (gSavedSettings.getBOOL("FSUseStandaloneBlocklistFloater"))
-	{
-		LLFloaterReg::showInstance("fs_blocklist", LLSD());
-	}
-	else
-	{
-		LLFloaterSidePanelContainer::showPanel("people", "panel_people",
-			LLSD().with("people_panel_tab_name", "blocked_panel"));
-	}
+	LLPanelBlockedList::showPanelAndSelect();
 	// </FS:Ansariel>
 }
 
diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp
index 248dc0e717..e0c439ad60 100755
--- a/indra/newview/llpanelblockedlist.cpp
+++ b/indra/newview/llpanelblockedlist.cpp
@@ -48,6 +48,8 @@
 #include "llsidetraypanelcontainer.h"
 #include "llviewercontrol.h"
 
+#include "fspanelblocklist.h"
+
 static LLPanelInjector<LLPanelBlockedList> t_panel_blocked_list("panel_block_list_sidetray");
 
 //
@@ -138,24 +140,10 @@ void LLPanelBlockedList::selectBlocked(const LLUUID& mute_id)
 
 void LLPanelBlockedList::showPanelAndSelect(const LLUUID& idToSelect)
 {
-	// <FS:Ansariel> FIRE-572: Disable auto-open of blocklist
-	if (gSavedSettings.getBOOL("FSDisableBlockListAutoOpen"))
-	{
-		return;
-	}
-
-	// <FS:Ansariel> Optional standalone blocklist floater
+	// <FS:Ansariel> Defer handling to our blocklist panel for convenience since it is replacing LL's version
 	//LLFloaterSidePanelContainer::showPanel("people", "panel_people",
 	//	LLSD().with("people_panel_tab_name", "blocked_panel").with(BLOCKED_PARAM_NAME, idToSelect));
-	if (gSavedSettings.getBOOL("FSUseStandaloneBlocklistFloater"))
-	{
-		LLFloaterReg::showInstance("fs_blocklist", LLSD().with(BLOCKED_PARAM_NAME, idToSelect));
-	}
-	else
-	{
-		LLFloaterSidePanelContainer::showPanel("people", "panel_people",
-			LLSD().with("people_panel_tab_name", "blocked_panel").with(BLOCKED_PARAM_NAME, idToSelect));
-	}
+	FSPanelBlockList::showPanelAndSelect(idToSelect);
 	// </FS:Ansariel>
 }
 
diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h
index e55fdf668a..df58a7cf2d 100755
--- a/indra/newview/llpanelblockedlist.h
+++ b/indra/newview/llpanelblockedlist.h
@@ -52,7 +52,9 @@ public:
 	 *	@param idToSelect - LLUUID of blocked Resident or Object to be selected. 
 	 *			If it is LLUUID::null, nothing will be selected.
 	 */
-	static void showPanelAndSelect(const LLUUID& idToSelect);
+	// </FS:Ansariel> Optional standalone blocklist floater
+	//static void showPanelAndSelect(const LLUUID& idToSelect);
+	static void showPanelAndSelect(const LLUUID& idToSelect = LLUUID::null);
 	
 private:
 

From bb6761859b799a2900ddab7c7514540b2a42c1c8 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 11 Dec 2014 13:33:06 +0100
Subject: [PATCH 173/229] Undo FS-specific changes to LLPanelBlockedList that
 aren't needed anymore due to FSPanelBlockList

---
 indra/newview/llpanelblockedlist.cpp | 42 ++++------------------------
 indra/newview/llpanelblockedlist.h   |  3 --
 2 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp
index e0c439ad60..f11559739a 100755
--- a/indra/newview/llpanelblockedlist.cpp
+++ b/indra/newview/llpanelblockedlist.cpp
@@ -80,10 +80,6 @@ BOOL LLPanelBlockedList::postBuild()
 {
 	mBlockedList = getChild<LLBlockList>("blocked");
 	mBlockedList->setCommitOnSelectionChange(TRUE);
-	// <FS:Ansariel> Performance tweak
-	mBlockedList->setCommitCallback(boost::bind(&LLPanelBlockedList::onSelectionChanged, this));
-	// <FS:Ansariel> Blocklist multi selection
-	mBlockedList->setAllowMultipleSelection(true);
     this->setVisibleCallback(boost::bind(&LLPanelBlockedList::removePicker, this));
 
 	switch (gSavedSettings.getU32("BlockPeopleSortOrder"))
@@ -110,16 +106,12 @@ BOOL LLPanelBlockedList::postBuild()
 	getChild<LLButton>("unblock_btn")->setCommitCallback(boost::bind(&LLPanelBlockedList::unblockItem, this));
 	getChild<LLFilterEditor>("blocked_filter_input")->setCommitCallback(boost::bind(&LLPanelBlockedList::onFilterEdit, this, _2));
 
-	// <FS:Ansariel> Performance tweak
-	onSelectionChanged();
-
 	return LLPanel::postBuild();
 }
 
 void LLPanelBlockedList::draw()
 {
-	// <FS:Ansariel> Performance tweak
-	//updateButtons();
+	updateButtons();
 	LLPanel::draw();
 }
 
@@ -133,8 +125,6 @@ void LLPanelBlockedList::onOpen(const LLSD& key)
 
 void LLPanelBlockedList::selectBlocked(const LLUUID& mute_id)
 {
-	// <FS:Ansariel> Clear selection first before selecting new
-	mBlockedList->resetSelection();
 	mBlockedList->selectItemByUUID(mute_id);
 }
 
@@ -160,27 +150,12 @@ void LLPanelBlockedList::updateButtons()
 
 void LLPanelBlockedList::unblockItem()
 {
-	// <FS:Ansariel> Blocklist multi selection
-	//LLBlockedListItem* item = mBlockedList->getBlockedItem();
-	//if (item)
-	//{
-	//	LLMute mute(item->getUUID(), item->getName());
-	//	LLMuteList::instance().remove(mute);
-	//}
-
-	std::vector<LLPanel*> panels;
-	mBlockedList->getSelectedItems(panels);
-	for (std::vector<LLPanel*>::iterator it = panels.begin(); it != panels.end(); ++it)
+	LLBlockedListItem* item = mBlockedList->getBlockedItem();
+	if (item)
 	{
-		LLBlockedListItem* item = dynamic_cast<LLBlockedListItem*>(*it);
-		if (item)
-		{
-			LLMute mute(item->getUUID(), item->getName());
-			LLMuteList::getInstance()->remove(mute);
-		}
+		LLMute mute(item->getUUID(), item->getName());
+		LLMuteList::instance().remove(mute);
 	}
-	onSelectionChanged();
-	// </FS:Ansariel>
 }
 
 void LLPanelBlockedList::onCustomAction(const LLSD& userdata)
@@ -255,13 +230,6 @@ void LLPanelBlockedList::onFilterEdit(const std::string& search_string)
 	mBlockedList->setNameFilter(filter);
 }
 
-// <FS:Ansariel> Performance tweak
-void LLPanelBlockedList::onSelectionChanged()
-{
-	updateButtons();
-}
-// </FS:Ansariel>
-
 void LLPanelBlockedList::callbackBlockPicked(const uuid_vec_t& ids, const std::vector<LLAvatarName> names)
 {
 	if (names.empty() || ids.empty()) return;
diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h
index df58a7cf2d..d39725e4a0 100755
--- a/indra/newview/llpanelblockedlist.h
+++ b/indra/newview/llpanelblockedlist.h
@@ -72,9 +72,6 @@ private:
 	void blockObjectByName();
 	void onFilterEdit(const std::string& search_string);
 
-	// <FS:Ansariel> Performance tweak
-	void onSelectionChanged();
-
 	// List commnads
 	void onCustomAction(const LLSD& userdata);
 	BOOL isActionChecked(const LLSD& userdata);

From 23f7575f82e2f61c5b7be6dc3dfa553e855499ff Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 11 Dec 2014 14:18:04 +0100
Subject: [PATCH 174/229] Fix newly added blocked avatar is not selected in
 blocklist when using the blocklist intergrated in the people panel

---
 indra/newview/llpanelpeople.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 5257fd1169..a9ea6d901f 100755
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -1580,6 +1580,17 @@ void LLPanelPeople::onOpen(const LLSD& key)
 	std::string tab_name = key["people_panel_tab_name"];
 	if (!tab_name.empty())
 		mTabContainer->selectTabByName(tab_name);
+
+	// <FS:Ansariel> Call onOpen for the blocklist panel to select mute if necessary
+	if (tab_name == "blocked_panel")
+	{
+		LLPanel* blocklist_impl_panel = mTabContainer->getCurrentPanel()->findChild<LLPanel>("panel_block_list_sidetray");
+		if (blocklist_impl_panel)
+		{
+			blocklist_impl_panel->onOpen(key);
+		}
+	}
+	// </FS:Ansariel>
 }
 
 bool LLPanelPeople::notifyChildren(const LLSD& info)

From 105ef3a1bfc62346507c24bf72302b45bf5a4403 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 11 Dec 2014 14:29:23 +0100
Subject: [PATCH 175/229] Fix warning about missing gear button on blocklist
 panel

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

diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index a9ea6d901f..9a633c67be 100755
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -1036,7 +1036,10 @@ void LLPanelPeople::updateButtons()
 				cur_panel->getChildView("friends_del_btn")->setEnabled(multiple_selected);
 			}
 
-			if (!group_tab_active)
+			// <FS:Ansariel> Fix warning about missing gear button on blocklist panel
+			//if (!group_tab_active)
+			if (!group_tab_active && cur_tab != BLOCKED_TAB_NAME)
+			// </FS:Ansariel>
 			{
 				cur_panel->getChildView("gear_btn")->setEnabled(multiple_selected);
 			}

From e3d3e964fed05e78fed5045c05a6d3eec277590d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 11 Dec 2014 14:34:34 +0100
Subject: [PATCH 176/229] Fix enabled state of gear button in blocklist

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

diff --git a/indra/newview/fspanelblocklist.cpp b/indra/newview/fspanelblocklist.cpp
index a2a946ec1e..49c26bc467 100644
--- a/indra/newview/fspanelblocklist.cpp
+++ b/indra/newview/fspanelblocklist.cpp
@@ -167,7 +167,9 @@ void FSPanelBlockList::refreshBlockedList()
 
 void FSPanelBlockList::updateButtons()
 {
-	getChildView("unblock_btn")->setEnabled(mBlockedList->getNumSelected() > 0);
+	bool has_selection = mBlockedList->getNumSelected() > 0;
+	getChildView("blocked_gear_btn")->setEnabled(has_selection);
+	getChildView("unblock_btn")->setEnabled(has_selection);
 }
 
 void FSPanelBlockList::removeMutes()

From ec473ef262cb130a027b604d25949515aa7d6c36 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 11 Dec 2014 16:29:01 +0100
Subject: [PATCH 177/229] FIRE-15074: Render normal imposters properly and
 don't use weird (Don't tie visual mute to RenderAvatarMaxVisible)

---
 indra/newview/llvoavatar.cpp | 38 +++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index fcd1b16249..ab923aa866 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3498,25 +3498,27 @@ bool LLVOAvatar::isVisuallyMuted()
 						(mVisualComplexity > max_cost && max_render_cost > 0);
 
 					// Could be part of the grand || collection above, but yanked out to make the logic visible
-					if (!muted)
-					{
-						if (sMaxVisible > 0)
-						{	// They are above the visibilty rank - mute them
-							muted = (mVisibilityRank > sMaxVisible);
-						}
+					// <FS:Ansariel> FIRE-15074: Render normal imposters properly (Don't tie visual mute to RenderAvatarMaxVisible)
+					//if (!muted)
+					//{
+					//	if (sMaxVisible > 0)
+					//	{	// They are above the visibilty rank - mute them
+					//		muted = (mVisibilityRank > sMaxVisible);
+					//	}
 			
-						// Always draw friends or those in IMs.  Needs UI?
-						if ((render_auto_mute_functions & 0x02) &&
-							(muted || sMaxVisible == 0))		// Don't mute friends or IMs							
-						{
-							muted = !(LLAvatarTracker::instance().isBuddy(getID()));
-							if (muted)
-							{	// Not a friend, so they are muted ... are they in an IM?
-								LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL,getID());
-								muted = !gIMMgr->hasSession(session_id);
-							}
-						}
-					}
+					//	// Always draw friends or those in IMs.  Needs UI?
+					//	if ((render_auto_mute_functions & 0x02) &&
+					//		(muted || sMaxVisible == 0))		// Don't mute friends or IMs							
+					//	{
+					//		muted = !(LLAvatarTracker::instance().isBuddy(getID()));
+					//		if (muted)
+					//		{	// Not a friend, so they are muted ... are they in an IM?
+					//			LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL,getID());
+					//			muted = !gIMMgr->hasSession(session_id);
+					//		}
+					//	}
+					//}
+					// </FS:Ansariel>
 
 					// Save visual mute state and set interval for updating
 					const F64 SECONDS_BETWEEN_RENDER_AUTO_MUTE_UPDATES = 1.5;

From 0fa86b15875bbb697cc503cbd95b744c21b35bbc Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 11 Dec 2014 19:23:36 +0100
Subject: [PATCH 178/229] FIRE-15110: RLV @getattach command for "Center 2"
 attachment point doesn't work:

* Need to omit the legacy attachment point name instead of the current bridge attachment point (Center 2)
* Omit bridge attachment when calling @getattach
---
 indra/newview/fslslbridge.h  |  2 +-
 indra/newview/rlvhandler.cpp | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/indra/newview/fslslbridge.h b/indra/newview/fslslbridge.h
index f555722d75..8b21f40c8f 100644
--- a/indra/newview/fslslbridge.h
+++ b/indra/newview/fslslbridge.h
@@ -77,6 +77,7 @@ public:
 	void setBridge(LLViewerInventoryItem* item) { mpBridge = item; };
 	LLViewerInventoryItem* getBridge() { return mpBridge; };
 	bool canUseBridge();
+	bool isBridgeValid() const { return NULL != mpBridge; }
 
 	void checkBridgeScriptName(const std::string& fileName);
 	std::string currentFullName() { return mCurrentFullName; }
@@ -106,7 +107,6 @@ private:
 	LLUUID					mBridgeUUID;
 
 	bool					mIsFirstCallDone; //initialization conversation
-	bool isBridgeValid() const { return NULL != mpBridge; }
 
 	uuid_vec_t				mAllowedDetachables;
 
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index dbc908fbd3..0f1b06becd 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -2033,14 +2033,16 @@ ERlvCmdRet RlvHandler::onGetAttach(const RlvCommand& rlvCmd, std::string& strRep
 	{
 		const LLViewerJointAttachment* pAttachPt = itAttach->second;
 		//<FS:TS> FIRE-11848 @getattach includes the LSL bridge
-		if (pAttachPt->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME)
+		if (pAttachPt->getName() == "Bridge")
 		{
 			continue;
 		}
 		//</FS:TS> FIRE-11848
 		if ( (0 == idxAttachPt) || (itAttach->first == idxAttachPt) )
 		{
-			bool fWorn = (pAttachPt->getNumObjects() > 0) && 
+			// Ansa: Do not include the bridge when checking for number of objects
+			S32 bridge_correct = (pAttachPt->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME && FSLSLBridge::instance().isBridgeValid()) ? 1 : 0;
+			bool fWorn = ((pAttachPt->getNumObjects() - bridge_correct) > 0) && 
 				( (!RlvSettings::getHideLockedAttach()) || (RlvForceWear::isForceDetachable(pAttachPt, true, rlvCmd.getObjectID())) );
 			strReply.push_back( (fWorn) ? '1' : '0' );
 		}
@@ -2064,7 +2066,7 @@ ERlvCmdRet RlvHandler::onGetAttachNames(const RlvCommand& rlvCmd, std::string& s
 	{
 		const LLViewerJointAttachment* pAttachPt = itAttach->second;
 		//<FS:TS> FIRE-11848 @getattach includes the LSL bridge
-		if (pAttachPt->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME)
+		if (pAttachPt->getName() == "Bridge")
 		{
 			continue;
 		}
@@ -2075,7 +2077,11 @@ ERlvCmdRet RlvHandler::onGetAttachNames(const RlvCommand& rlvCmd, std::string& s
 			switch (rlvCmd.getBehaviourType())
 			{
 				case RLV_BHVR_GETATTACHNAMES:		// Every attachment point that has an attached object
-					fAdd = (pAttachPt->getNumObjects() > 0);
+					// Ansa: Do not include the bridge when checking for number of objects
+					{
+						S32 bridge_correct = ((pAttachPt->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME && FSLSLBridge::instance().isBridgeValid()) ? 1 : 0);
+						fAdd = ((pAttachPt->getNumObjects() - bridge_correct) > 0);
+					}
 					break;
 				case RLV_BHVR_GETADDATTACHNAMES:	// Every attachment point that can be attached to (wear replace OR wear add)
 					fAdd = (gRlvAttachmentLocks.canAttach(pAttachPt) & RLV_WEAR);

From 18f4033d8ff5047864433c52d364074f1c704a37 Mon Sep 17 00:00:00 2001
From: Jessica <none@none>
Date: Thu, 11 Dec 2014 17:08:08 -0500
Subject: [PATCH 179/229] Fixed opensim voice issue not reconnecting after
 Teleport. FIRE-15122. TY Cinder and Ans for your help.

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

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index e5c21e9d10..f7403fda1f 100755
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -169,7 +169,12 @@ void LLVoiceClient::setHidden(bool hidden)
 {
     if (mVoiceModule)
     {
-        mVoiceModule->setHidden(hidden);
+        //mVoiceModule->setHidden(hidden);
+		#ifdef OPENSIM
+			mVoiceModule->setHidden(hidden && LLGridManager::getInstance()->isInSecondLife());
+		#else
+        mVoiceModule->setHidden(hidden);
+		#endif
     }
 }
 

From d086c348d7967f036f82638e81d1d04381888174 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 11 Dec 2014 23:47:57 +0100
Subject: [PATCH 180/229] EOL fix

---
 indra/newview/llvoiceclient.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index f7403fda1f..34e00d67da 100755
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -170,10 +170,10 @@ void LLVoiceClient::setHidden(bool hidden)
     if (mVoiceModule)
     {
         //mVoiceModule->setHidden(hidden);
-		#ifdef OPENSIM
-			mVoiceModule->setHidden(hidden && LLGridManager::getInstance()->isInSecondLife());
-		#else
-        mVoiceModule->setHidden(hidden);
+		#ifdef OPENSIM
+			mVoiceModule->setHidden(hidden && LLGridManager::getInstance()->isInSecondLife());
+		#else
+        mVoiceModule->setHidden(hidden);
 		#endif
     }
 }

From a50456ed3bd24cc4024f91edde0c5ce85c2681fd Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 12 Dec 2014 09:16:26 +0100
Subject: [PATCH 181/229] Add some logging to check for null group id in group
 notices

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

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index a98d1cafd4..ce3c3cbebb 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3177,6 +3177,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				//args["MESSAGE"] = mes;
 				//LLNotifications::instance().add(LLNotification::Params("GroupNotice").substitutions(args).payload(payload).time_stamp(LLDate(timestamp)));
 				//make_ui_sound("UISndGroupNotice"); // <FS:PP> Group notice sound
+				if (group_id.isNull())
+				{
+					LL_WARNS() << "Received group notice with null id!" << LL_ENDL;
+				}
 				gCacheName->get(group_id, true, boost::bind(&notification_group_name_cb, _2, name, subj, mes, payload, timestamp));
 				// </FS:Ansariel>
 			}

From 03e15a2c56ddd4a67818d9047a9db3ee2d23d1dc Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Fri, 12 Dec 2014 09:36:00 +0100
Subject: [PATCH 182/229] tip to default branch.

---
 README_BUILD_FIRESTORM_MACOSX.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README_BUILD_FIRESTORM_MACOSX.txt b/README_BUILD_FIRESTORM_MACOSX.txt
index 0d7d57e6b1..c44631128e 100755
--- a/README_BUILD_FIRESTORM_MACOSX.txt
+++ b/README_BUILD_FIRESTORM_MACOSX.txt
@@ -41,7 +41,6 @@ To build firestorm:
         autobuild build -c ReleaseFS                        
 
 Other examples:
-
         autobuild configure -c ReleaseFS                    # basic configuration step, don't build, just configure
         autobuild configure -c ReleaseFS -- --clean         # clean the output area first, then configure
         autobuild configure -c ReleaseFS -- --chan Private-Yourname   # configure with a custom channel

From 389ed1f77129de75e45e5d225329f81408a18c74 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 12 Dec 2014 13:31:32 +0100
Subject: [PATCH 183/229] FIRE-15131: Added option to let keywords only match
 whole words

---
 .../app_settings/settings_per_account.xml     | 11 ++++++
 indra/newview/fskeywords.cpp                  | 36 +++++++++++++++----
 .../default/xui/de/panel_preferences_chat.xml |  1 +
 .../default/xui/en/panel_preferences_chat.xml | 11 ++++++
 4 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index cdf3dd8f67..4cfd651064 100755
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -643,6 +643,17 @@
 		<key>Value</key>
 			<integer>0</integer>
 	</map>
+	<key>FSKeywordMatchWholeWords</key>
+	<map>
+		<key>Comment</key>
+			<string>Keywords will only match whole words</string>
+		<key>Persist</key>
+			<integer>1</integer>
+		<key>Type</key>
+			<string>Boolean</string>
+		<key>Value</key>
+			<integer>0</integer>
+	</map>
 	<key>FSKeywords</key>
 	<map>
 		<key>Comment</key>
diff --git a/indra/newview/fskeywords.cpp b/indra/newview/fskeywords.cpp
index 59c37f272f..836eda8f68 100644
--- a/indra/newview/fskeywords.cpp
+++ b/indra/newview/fskeywords.cpp
@@ -35,13 +35,12 @@
 #include "llviewercontrol.h"
 
 #include <boost/regex.hpp>
-//#include <boost/algorithm/string/find.hpp> //for boost::ifind_first
-
 
 FSKeywords::FSKeywords()
 {
 	gSavedPerAccountSettings.getControl("FSKeywords")->getSignal()->connect(boost::bind(&FSKeywords::updateKeywords, this));
 	gSavedPerAccountSettings.getControl("FSKeywordCaseSensitive")->getSignal()->connect(boost::bind(&FSKeywords::updateKeywords, this));
+	gSavedPerAccountSettings.getControl("FSKeywordMatchWholeWords")->getSignal()->connect(boost::bind(&FSKeywords::updateKeywords, this));
 	updateKeywords();
 }
 
@@ -51,6 +50,7 @@ FSKeywords::~FSKeywords()
 
 void FSKeywords::updateKeywords()
 {
+	BOOL match_whole_words = gSavedPerAccountSettings.getBOOL("FSKeywordMatchWholeWords");
 	std::string s = gSavedPerAccountSettings.getString("FSKeywords");
 	if (!gSavedPerAccountSettings.getBOOL("FSKeywordCaseSensitive"))
 	{
@@ -61,7 +61,14 @@ void FSKeywords::updateKeywords()
 	mWordList.clear();
 	while (begin != end)
 	{
-		mWordList.push_back(*begin++);
+		if (match_whole_words)
+		{
+			mWordList.push_back(boost::regex_replace(std::string(*begin++), boost::regex("[.^$|()\\[\\]{}*+?\\\\]"), "\\\\&", boost::match_default|boost::format_sed));
+		}
+		else
+		{
+			mWordList.push_back(*begin++);
+		}
 	}
 }
 
@@ -71,6 +78,7 @@ bool FSKeywords::chatContainsKeyword(const LLChat& chat, bool is_local)
 	static LLCachedControl<bool> sFSKeywordInChat(gSavedPerAccountSettings, "FSKeywordInChat", false);
 	static LLCachedControl<bool> sFSKeywordInIM(gSavedPerAccountSettings, "FSKeywordInIM", false);
 	static LLCachedControl<bool> sFSKeywordCaseSensitive(gSavedPerAccountSettings, "FSKeywordCaseSensitive", false);
+	static LLCachedControl<bool> sFSKeywordMatchWholeWords(gSavedPerAccountSettings, "FSKeywordMatchWholeWords", false);
 
 	if (!sFSKeywordOn ||
 		(is_local && !sFSKeywordInChat) ||
@@ -86,13 +94,27 @@ bool FSKeywords::chatContainsKeyword(const LLChat& chat, bool is_local)
 		LLStringUtil::toLower(source);
 	}
 
-	for (std::vector<std::string>::iterator it = mWordList.begin(); it != mWordList.end(); ++it)
+	if (sFSKeywordMatchWholeWords)
 	{
-		if (source.find((*it)) != std::string::npos)
+		for (std::vector<std::string>::iterator it = mWordList.begin(); it != mWordList.end(); ++it)
 		{
-			return true;
+			if (boost::regex_search(source, boost::regex("\\b" + (*it) + "\\b")))
+			{
+				return true;
+			}
 		}
 	}
+	else
+	{
+		for (std::vector<std::string>::iterator it = mWordList.begin(); it != mWordList.end(); ++it)
+		{
+			if (source.find((*it)) != std::string::npos)
+			{
+				return true;
+			}
+		}
+	}
+
 	return false;
 }
 
@@ -101,7 +123,7 @@ void FSKeywords::notify(const LLChat& chat)
 {
 	if (chat.mFromID != gAgentID || chat.mFromName == SYSTEM_FROM)
 	{
-		if (!LLMuteList::getInstance()->isMuted(chat.mFromID) && !chat.mMuted)
+		if (!chat.mMuted && !LLMuteList::getInstance()->isMuted(chat.mFromID))
 		{
 			static LLCachedControl<bool> PlayModeUISndFSKeywordSound(gSavedSettings, "PlayModeUISndFSKeywordSound");
 			if (PlayModeUISndFSKeywordSound)
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 90dc3e1ceb..7f024ef049 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -267,6 +267,7 @@
 			<check_box name="FSKeywordInChat" label="Lokalen Chat auf Schüsselwörter prüfen"/>
 			<check_box name="FSKeywordInIM" label="Instant Messages und Gruppenchats auf Schlüsselwörter prüfen"/>
 			<check_box name="FSKeywordCaseSensitive" label="Groß-/Kleinschreibung bei Schlüsselwörtern beachten"/>
+			<check_box name="FSKeywordMatchWholeWords" label="Nur ganze Wörter prüfen"/>
 			<text name="textFSKeywords">
 				Schlüsselwörter (getrennt durch Komma):
 			</text>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 1402950242..ea392dde65 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -1780,6 +1780,17 @@
              control_name="FSKeywordCaseSensitive"
              name="FSKeywordCaseSensitive"
              label="All Keywords are case-sensitive"/>
+            <check_box
+             enabled_control="FSKeywordOn"
+             layout="topleft"
+             follows="left|top"
+             top_delta="25"
+             left="20"
+             width="150"
+             height="20"
+             control_name="FSKeywordMatchWholeWords"
+             name="FSKeywordMatchWholeWords"
+             label="Only match whole words"/>
             <text
              layout="topleft"
              follows="left|top"

From 250ea826cfc4fc77209d1865153451d83ed9aae0 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sat, 13 Dec 2014 21:55:13 +0100
Subject: [PATCH 184/229] Updated Polish translation

---
 indra/newview/skins/default/xui/pl/floater_joystick.xml       | 2 +-
 indra/newview/skins/default/xui/pl/panel_preferences_chat.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml
index c3345f97eb..d3bded4ab4 100755
--- a/indra/newview/skins/default/xui/pl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml
@@ -3,7 +3,7 @@
 	<string name="NoDevice">
 		nie wykryto urządzenia
 	</string>
-	<check_box label="Aktywuj Joystick:" name="enable_joystick"/>
+	<check_box label="Włącz joystick:" name="enable_joystick"/>
 	<spinner label="Kalibruj oś X" name="JoystickAxis1"/>
 	<spinner label="Kalibruj oś Y" name="JoystickAxis2"/>
 	<spinner label="Kalibruj oś Z" name="JoystickAxis0"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index 691f183742..1bd1734f5b 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -248,6 +248,7 @@
 			<check_box name="FSKeywordInChat" label="Szukaj słów w Czacie Lokalnym"/>
 			<check_box name="FSKeywordInIM" label="Szukaj słów w IM i czatach grupowych"/>
 			<check_box name="FSKeywordCaseSensitive" label="Bierz pod uwagę wielkość liter w szukanych słowach"/>
+			<check_box name="FSKeywordMatchWholeWords" label="Dopasowywuj tylko całe słowa"/>
 			<text name="textFSKeywords">
 				Szukane słowa (oddzielone przecinkami):
 			</text>

From ba00048022c224af40a7ad4bcad5c3246893246d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 14 Dec 2014 02:06:04 +0100
Subject: [PATCH 185/229] FIRE-15158: Show Chat Bar icon will not go away when
 toolbar is cleared on Vintage and Latency skins

---
 indra/newview/lltoolbarview.cpp | 10 ++++++++--
 indra/newview/lltoolbarview.h   |  3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index a15c38cb84..9224ba6b96 100755
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -83,8 +83,9 @@ LLToolBarView::LLToolBarView(const LLToolBarView::Params& p)
 	// <FS:Ansariel> Member variables needed for console chat bottom offset
 	//mBottomToolbarPanel(NULL)
 	mBottomToolbarPanel(NULL),
-	mBottomChatStack(NULL)
+	mBottomChatStack(NULL),
 	// </FS:Ansariel> Member variables needed for console chat bottom offset
+	mHideBottomOnEmpty(false) // <FS:Ansariel> Added to determine if toolbar gets hidden when empty
 {
 	for (S32 i = 0; i < LLToolBarEnums::TOOLBAR_COUNT; i++)
 	{
@@ -128,6 +129,11 @@ BOOL LLToolBarView::postBuild()
 	// <FS:Ansariel> Member variable needed for console chat bottom offset
 	mBottomChatStack = findChild<LLView>("bottom_chat_stack");
 
+	// <FS:Ansariel> Added to determine if toolbar gets hidden when empty
+	std::string current_skin = gSavedSettings.getString("SkinCurrent");
+	mHideBottomOnEmpty = (current_skin == "vintage" || current_skin == "latency");
+	// </FS:Ansariel>
+
 	return TRUE;
 }
 
@@ -605,7 +611,7 @@ void LLToolBarView::draw()
 		mToolbars[i]->getParent()->setVisible(mShowToolbars 
 											// <FS:Ansariel> FIRE-5141: Nearby chat floater can no longer be resized when all buttons are removed from bottom FUI panel
 											//&& (mToolbars[i]->hasButtons() 
-											&& ((i == LLToolBarEnums::TOOLBAR_BOTTOM ? true : mToolbars[i]->hasButtons())
+											&& (((i == LLToolBarEnums::TOOLBAR_BOTTOM && !mHideBottomOnEmpty) ? true : mToolbars[i]->hasButtons())
 											// </FS:Ansariel>
 											|| isToolDragged()));
 	}
diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h
index e0054e67d7..096c5c7dae 100755
--- a/indra/newview/lltoolbarview.h
+++ b/indra/newview/lltoolbarview.h
@@ -132,6 +132,9 @@ private:
 	// <FS:Ansariel> Member variables needed for console chat bottom offset
 	LLView*				mBottomChatStack;
 	// </FS:Ansariel>
+
+	// <FS:Ansariel> Added to determine if toolbar gets hidden when empty
+	bool				mHideBottomOnEmpty;
 };
 
 extern LLToolBarView* gToolBarView;

From 363d5f7b1aa68e7af41013f40c7d5051e5f17c67 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 14 Dec 2014 02:22:03 +0100
Subject: [PATCH 186/229] FIRE-15143: [Vintage] Talk button does not highlight
 when locked open

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

diff --git a/indra/newview/utilitybar.cpp b/indra/newview/utilitybar.cpp
index d3d8a506ce..0150d86365 100644
--- a/indra/newview/utilitybar.cpp
+++ b/indra/newview/utilitybar.cpp
@@ -142,6 +142,7 @@ BOOL UtilityBar::tick()
 
 	if (mTalkButton)
 	{
+		mTalkButton->setValue(gAgent.isMicrophoneOn(LLSD()));
 		mTalkButton->setEnabled(LLAgent::isActionAllowed(LLSD("speak")));
 	}
 	if (mPTTButton)

From fef5425ce3d47e22491cbb206caee0c051545530 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 14 Dec 2014 13:33:13 +0100
Subject: [PATCH 187/229] FIRE-15176: Fix wrong notification text for
 ScriptQuestion

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4db9087533..ceb2bbd549 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7581,7 +7581,7 @@ The item you are trying to wear uses a feature that your viewer cannot read. Ple
 &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, would like to:
 
 [QUESTIONS]
-Is this OK? Selecting "Mute" will block all further messages from &apos;[NAME]&apos;.
+Is this OK?
   <tag>confirm</tag>
     <form name="form">
       <button
@@ -7595,7 +7595,7 @@ Is this OK? Selecting "Mute" will block all further messages from &apos;[NAME]&a
       <button
        index="2"
        name="Mute"
-       text="Mute Owner"/>
+       text="Block"/>
     </form>
   </notification>
 

From 16c02be16af1b8ecba0e96d64bcd53b907ecdd18 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Mon, 15 Dec 2014 02:24:33 +0100
Subject: [PATCH 188/229] Enable usage of PlayModeUISndScriptFloaterOpen
 trigger in Vintage and Latency skins

---
 .../newview/app_settings/settings_latency.xml  | 18 +++++++++++-------
 .../newview/app_settings/settings_phoenix.xml  | 12 ++++++++++++
 .../skins/latency/xui/en/floater_script.xml    |  1 -
 .../skins/vintage/xui/en/floater_script.xml    |  1 -
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/indra/newview/app_settings/settings_latency.xml b/indra/newview/app_settings/settings_latency.xml
index 12ccbb46a5..90facf0e31 100644
--- a/indra/newview/app_settings/settings_latency.xml
+++ b/indra/newview/app_settings/settings_latency.xml
@@ -735,13 +735,17 @@
 			<integer>1</integer>
 		</map>
 
-
-
-
-
-
-
-
+    <key>PlayModeUISndScriptFloaterOpen</key>
+		<map>
+		<key>Persist</key>
+			<integer>1</integer>
+		<key>Comment</key>
+			<string>Holds state for Prefs &gt; Sound/Media &gt; UI Sounds - UISndScriptFloaterOpen.</string>
+		<key>Type</key>
+			<string>Boolean</string>
+		<key>Value</key>
+			<integer>0</integer>
+		</map>
 
 </map>
 </llsd>
diff --git a/indra/newview/app_settings/settings_phoenix.xml b/indra/newview/app_settings/settings_phoenix.xml
index 614a9b50d9..c31179a8e5 100644
--- a/indra/newview/app_settings/settings_phoenix.xml
+++ b/indra/newview/app_settings/settings_phoenix.xml
@@ -519,6 +519,18 @@
     <integer>1</integer>
   </map>
 
+  <key>PlayModeUISndScriptFloaterOpen</key>
+  <map>
+    <key>Comment</key>
+    <string>Holds state for Prefs &gt; Sound/Media &gt; UI Sounds - UISndScriptFloaterOpen.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+
   <!-- <FS_Zi> Animated dialogs -->
   <key>FSAnimatedScriptDialogs</key>
   <map>
diff --git a/indra/newview/skins/latency/xui/en/floater_script.xml b/indra/newview/skins/latency/xui/en/floater_script.xml
index 2ca75158d6..54c907135f 100644
--- a/indra/newview/skins/latency/xui/en/floater_script.xml
+++ b/indra/newview/skins/latency/xui/en/floater_script.xml
@@ -5,7 +5,6 @@
 	bg_alpha_image="floater_script_background"
 	bg_alpha_image_overlay="ScriptDialog"
 	can_close="true"
-	sound_flags="0"
 	background_visible="true"
 	legacy_header_height="18"
 	border_visible="true"
diff --git a/indra/newview/skins/vintage/xui/en/floater_script.xml b/indra/newview/skins/vintage/xui/en/floater_script.xml
index 26aa9ac713..7ada639cca 100644
--- a/indra/newview/skins/vintage/xui/en/floater_script.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_script.xml
@@ -5,7 +5,6 @@
 	bg_alpha_image="floater_script_background"
 	bg_alpha_image_overlay="ScriptDialog"
 	can_close="false"
-	sound_flags="0"
 	background_visible="true"
 	legacy_header_height="18"
 	drop_shadow="false"

From 4012409e2cebf643ac2fdd9f0289475dc9e2818b Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Mon, 15 Dec 2014 03:37:45 +0100
Subject: [PATCH 189/229] FIRE-15182; Webprofiles as default did not work, due
 to overeager status changes.

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

diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index a23f8939a2..26b8a6794d 100755
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -463,7 +463,7 @@ private:
 	{
 		// <FS:ND> FIRE-14935; Do not switch URI if there is still a saved URI to load
 		// if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
-		if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE && mInitialNavigateURL.empty() )
+		if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE && !mInitialNavigateURL.empty() )
 		// </FS:ND>
 		{
 			LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "navigate_begin");

From 993e26378450dc082d337dc6b57fa174111228a8 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 15 Dec 2014 09:21:19 +0100
Subject: [PATCH 190/229] FIRE-15116: Usernames with underscores don't work on
 OpenSim

---
 indra/newview/llpanellogin.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 3bce480896..fb1d6be739 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -663,7 +663,21 @@ void LLPanelLogin::getFields(LLPointer<LLCredential>& credential,
 	{
 		// Be lenient in terms of what separators we allow for two-word names
 		// and allow legacy users to login with firstname.lastname
+		// <FS:Ansariel> FIRE-15116: Usernames with underscores don't work on OpenSim
+		//separator_index = username.find_first_of(" ._");
+#ifdef OPENSIM
+		if (LLGridManager::getInstance()->isInSecondLife())
+		{
+			separator_index = username.find_first_of(" ._");
+		}
+		else
+		{
+			separator_index = username.find_first_of(" .");
+		}
+#else
 		separator_index = username.find_first_of(" ._");
+#endif
+		// </FS:Ansariel>
 		std::string first = username.substr(0, separator_index);
 		std::string last;
 		if (separator_index != username.npos)

From 1ee3e3f817155433c9d28def3dab08f8afac3e69 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 15 Dec 2014 10:44:06 +0100
Subject: [PATCH 191/229] FIRE-14593: Option to select only copyable objects

---
 indra/newview/app_settings/settings.xml            | 11 +++++++++++
 indra/newview/llselectmgr.cpp                      | 13 +++++++++++++
 indra/newview/lltoolselect.cpp                     |  6 ++++++
 indra/newview/skins/default/xui/de/menu_viewer.xml |  1 +
 indra/newview/skins/default/xui/en/menu_viewer.xml |  9 +++++++++
 5 files changed, 40 insertions(+)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index bd6c935911..cc3b469b74 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -20817,6 +20817,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>FSSelectCopyableOnly</key>
+    <map>
+      <key>Comment</key>
+      <string>Only include copyable objects during selection</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>FSShowMutedChatHistory</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 2a2d5fae2c..cc47e394bc 100755
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1031,6 +1031,13 @@ void LLSelectMgr::highlightObjectOnly(LLViewerObject *objectp, LLColor4 const &a
 		return;
 	}
 
+	// <FS:Ansariel> FIRE-14593: Option to select only copyable objects
+	if (!objectp->permCopy() && gSavedSettings.getBOOL("FSSelectCopyableOnly"))
+	{
+		return;
+	}
+	// </FS:Ansariel>
+
 	// <FS:Ansariel> FIRE-304: Option to exclude group owned objects
 	if (objectp->permGroupOwner() && !gSavedSettings.getBOOL("FSSelectIncludeGroupOwned"))
 	{
@@ -6920,6 +6927,12 @@ BOOL LLSelectMgr::canSelectObject(LLViewerObject* object)
 		// only select my own objects
 		return FALSE;
 	}
+	// <FS:Ansariel> FIRE-14593: Option to select only copyable objects
+	if (!object->permCopy() && gSavedSettings.getBOOL("FSSelectCopyableOnly"))
+	{
+		return FALSE;
+	}
+	// </FS:Ansariel>
 
 	// Can't select orphans
 	if (object->isOrphaned()) return FALSE;
diff --git a/indra/newview/lltoolselect.cpp b/indra/newview/lltoolselect.cpp
index e7e45a45ce..c6c45d3a0f 100755
--- a/indra/newview/lltoolselect.cpp
+++ b/indra/newview/lltoolselect.cpp
@@ -117,12 +117,16 @@ LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pi
 
 	BOOL select_owned = gSavedSettings.getBOOL("SelectOwnedOnly");
 	BOOL select_movable = gSavedSettings.getBOOL("SelectMovableOnly");
+	// <FS:Ansariel> FIRE-14593: Option to select only copyable objects
+	BOOL select_copyable = gSavedSettings.getBOOL("FSSelectCopyableOnly");
 	
 	// *NOTE: These settings must be cleaned up at bottom of function.
 	if (temp_select || LLSelectMgr::getInstance()->mAllowSelectAvatar)
 	{
 		gSavedSettings.setBOOL("SelectOwnedOnly", FALSE);
 		gSavedSettings.setBOOL("SelectMovableOnly", FALSE);
+		// <FS:Ansariel> FIRE-14593: Option to select only copyable objects
+		gSavedSettings.setBOOL("FSSelectCopyableOnly", FALSE);
 		LLSelectMgr::getInstance()->setForceSelection(TRUE);
 	}
 
@@ -257,6 +261,8 @@ LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pi
 	{
 		gSavedSettings.setBOOL("SelectOwnedOnly", select_owned);
 		gSavedSettings.setBOOL("SelectMovableOnly", select_movable);
+		// <FS:Ansariel> FIRE-14593: Option to select only copyable objects
+		gSavedSettings.setBOOL("FSSelectCopyableOnly", select_copyable);
 		LLSelectMgr::getInstance()->setForceSelection(FALSE);
 	}
 
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 1b1ff7c945..69378838bf 100755
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -191,6 +191,7 @@
 			<menu_item_check label="Erweiterte Berechtigungen anzeigen" name="DebugPermissions"/>
 			<menu_item_check label="Nur meine Objekte auswählen" name="Select Only My Objects"/>
 			<menu_item_check label="Nur bewegliche Objekte auswählen" name="Select Only Movable Objects"/>
+			<menu_item_check label="Nur kopierbare Objekte auswählen" name="Select Only Copyable Objects"/>
 			<menu_item_check label="Gruppen-Objekte einschließen" name="Include Group-Owned Objects"/>
 			<menu_item_check label="Nach Umgebung auswählen" name="Select By Surrounding"/>
 			<menu_item_check label="Auswahlumrandung anzeigen" name="Show Selection Outlines"/>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f19054d3af..ae20ef479a 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1611,6 +1611,15 @@
                      function="Tools.SelectOnlyMovableObjects"
                      parameter="movable" />
                 </menu_item_check>
+                <menu_item_check
+                 label="Select Only Copyable Objects"
+                 name="Select Only Copyable Objects">
+                    <menu_item_check.on_check
+                     control="FSSelectCopyableOnly" />
+                    <menu_item_check.on_click
+                     function="ToggleControl"
+                     parameter="FSSelectCopyableOnly" />
+                </menu_item_check>
                 <menu_item_check
                  label="Select By Surrounding"
                  name="Select By Surrounding">

From 1d1c4535a3e18b8f335a56cd74067ce8248e27ee Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 15 Dec 2014 10:50:13 +0100
Subject: [PATCH 192/229] Simply code for FSSelectIncludeGroupOwned setting

---
 indra/newview/llviewermenu.cpp                     | 14 --------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |  3 ++-
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index bad67fe854..24e4b890e7 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9050,20 +9050,6 @@ BOOL check_show_xui_names(void *)
 	return gSavedSettings.getBOOL("DebugShowXUINames");
 }
 
-// <FS:Ansariel> FIRE-304: Option to exclude group owned objects
-class FSToolSelectIncludeGroupOwned : public view_listener_t
-{
-	bool handleEvent(const LLSD& userdata)
-	{
-		BOOL cur_val = gSavedSettings.getBOOL("FSSelectIncludeGroupOwned");
-
-		gSavedSettings.setBOOL("FSSelectIncludeGroupOwned", ! cur_val );
-
-		return true;
-	}
-};
-// </FS:Ansariel>
-
 // <FS:CR> Resync Animations
 class FSToolsResyncAnimations : public view_listener_t
 {
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ae20ef479a..4868a0b65e 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1634,7 +1634,8 @@
                     <menu_item_check.on_check
                      control="FSSelectIncludeGroupOwned" />
                     <menu_item_check.on_click
-                     function="Tools.SelectIncludeGroupOwned" />
+                     function="ToggleControl"
+                     parameter="FSSelectIncludeGroupOwned" />
                 </menu_item_check>
 
           <menu_item_separator/>

From 5893dd1f104c4ca568c72572da2a49f96206c1d9 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 15 Dec 2014 10:55:13 +0100
Subject: [PATCH 193/229] Oooops, forgot to remove this...

---
 indra/newview/llviewermenu.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 24e4b890e7..6d707d0b2f 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -10643,8 +10643,6 @@ void initialize_menus()
 	commit.add("Tools.TakeCopy", boost::bind(&handle_take_copy));
 	view_listener_t::addMenu(new LLToolsSaveToObjectInventory(), "Tools.SaveToObjectInventory");
 	view_listener_t::addMenu(new LLToolsSelectedScriptAction(), "Tools.SelectedScriptAction");
-	// <FS:Ansariel> FIRE-304: Option to exclude group owned objects
-	view_listener_t::addMenu(new FSToolSelectIncludeGroupOwned(), "Tools.SelectIncludeGroupOwned");
 	view_listener_t::addMenu(new FSToolsResyncAnimations(), "Tools.ResyncAnimations");	// <FS:CR> Resync Animations
 	view_listener_t::addMenu(new FSToolsUndeform(), "Tools.Undeform");	// <FS:CR> FIRE-4345: Undeform
 

From 192e57328e80c70a1ec1c4c67adbfcbd7a3eea09 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 15 Dec 2014 12:33:54 +0100
Subject: [PATCH 194/229] FIRE-12905: Allow longer passwords in OpenSim

---
 indra/newview/llpanellogin.cpp                     | 6 ++++++
 indra/newview/skins/default/xui/en/panel_login.xml | 1 +
 2 files changed, 7 insertions(+)

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index fb1d6be739..208be901d1 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -1109,6 +1109,12 @@ void LLPanelLogin::updateServer()
 		// grid changed so show new splash screen (possibly)
 		updateServerCombo();
 		loadLoginPage();
+
+		// <FS:Ansariel> FIRE-12905: Allow longer passwords in OpenSim
+#ifdef OPENSIM
+		sInstance->getChild<LLLineEditor>("password_edit")->setMaxTextLength(LLGridManager::getInstance()->isInSecondLife() ? 16 : 255);
+#endif
+		// </FS:Ansariel>
 	}
 	catch (LLInvalidGridName ex)
 	{
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index a654945b93..ab89b1c0c1 100755
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -115,6 +115,7 @@ tool_tip="The account name you chose when you registered, like bobsmith420 or St
           width="128">
         Password:
       </text>
+      <!-- The max length might be changed in LLPanelLogin.cpp for Opensim! -->
       <line_editor
           follows="left|bottom"
           height="22"

From d585b61af723301bca5b04173c9dc714e8c032e2 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Mon, 15 Dec 2014 19:06:21 +0100
Subject: [PATCH 195/229] Updated Polish translation

---
 indra/newview/skins/default/xui/pl/menu_viewer.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index 368224945b..926bd4522c 100755
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -189,6 +189,7 @@
 			<menu_item_check label="Pokaż zaawansowane uprawnienia" name="DebugPermissions"/>
 			<menu_item_check label="Wybierz tylko moje obiekty" name="Select Only My Objects"/>
 			<menu_item_check label="Wybierz tylko obiekty przesuwalne" name="Select Only Movable Objects"/>
+			<menu_item_check label="Wybierz tylko obiekty kopiowalne" name="Select Only Copyable Objects"/>
 			<menu_item_check label="Dołącz obiekty, których właścicielem jest grupa" name="Include Group-Owned Objects"/>
 			<menu_item_check label="Wybierz przez otoczenie" name="Select By Surrounding"/>
 			<menu_item_check label="Pokaż kontury selekcji" name="Show Selection Outlines"/>

From 588943c71921f76e2cc8d7ebaa3100a6a78360e9 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 16 Dec 2014 09:52:20 +0100
Subject: [PATCH 196/229] FIRE-2875: Restrict *byte* length of text in 1st life
 profile tab to 253 bytes according to
 http://wiki.secondlife.com/wiki/Limits#Profile

---
 indra/newview/skins/default/xui/en/panel_profile_firstlife.xml | 2 +-
 indra/newview/skins/vintage/xui/en/panel_profile_firstlife.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index 28b253fa14..a276de4bc6 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -50,7 +50,7 @@
      follows="all"
      name="fl_description_edit"
      enabled="false"
-     max_length="512"
+     max_length="253"
      word_wrap="true"
      parse_urls="true" />
 </panel>
diff --git a/indra/newview/skins/vintage/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/vintage/xui/en/panel_profile_firstlife.xml
index cdb7e05624..cd53977bcb 100644
--- a/indra/newview/skins/vintage/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/vintage/xui/en/panel_profile_firstlife.xml
@@ -64,7 +64,7 @@
      follows="all"
      name="fl_description_edit"
      enabled="false"
-     max_length="512"
+     max_length="253"
      word_wrap="true"
      parse_urls="true" />
 </panel>

From c8c3809817a0cf5167e4d0dfec7fc88b61fc0489 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 16 Dec 2014 14:35:18 +0100
Subject: [PATCH 197/229] Always show complete avatar name instead of
 displayname when changing avatar permissions etc. to avoid spoofing

---
 indra/newview/fsfloatercontacts.cpp | 8 ++------
 indra/newview/fspanelprofile.cpp    | 3 +--
 indra/newview/llavatarlistitem.cpp  | 4 +++-
 indra/newview/llcallingcard.cpp     | 4 +++-
 indra/newview/llpanelgrouproles.cpp | 4 +++-
 indra/newview/llviewermessage.cpp   | 9 ++++++---
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp
index 52b14760de..2e5a17ccd7 100644
--- a/indra/newview/fsfloatercontacts.cpp
+++ b/indra/newview/fsfloatercontacts.cpp
@@ -43,6 +43,7 @@
 #include "llgrouplist.h"
 #include "llnotificationsutil.h"
 #include "llscrolllistctrl.h"
+#include "llslurl.h"
 #include "llstartup.h"
 #include "lltabcontainer.h"
 #include "llviewermenu.h"
@@ -870,12 +871,7 @@ void FSFloaterContacts::confirmModifyRights(rights_map_t& ids, EGrantRevoke comm
 		// for single friend, show their name
 		if (ids.size() == 1)
 		{
-			LLUUID agent_id = ids.begin()->first;
-			std::string name;
-			if (gCacheName->getFullName(agent_id, name))
-			{
-				args["NAME"] = name;
-			}
+			args["NAME"] = LLSLURL("agent", ids.begin()->first, "completename").getSLURLString();
 			if (command == GRANT)
 			{
 				LLNotificationsUtil::add("GrantModifyRights", 
diff --git a/indra/newview/fspanelprofile.cpp b/indra/newview/fspanelprofile.cpp
index 3b5e2c0ad7..93097800e2 100644
--- a/indra/newview/fspanelprofile.cpp
+++ b/indra/newview/fspanelprofile.cpp
@@ -1929,10 +1929,9 @@ void FSPanelAvatarNotes::rightsConfirmationCallback(const LLSD& notification,
 }
 
 void FSPanelAvatarNotes::confirmModifyRights(bool grant, S32 rights)
-// AO: If this is modified, also modify LLPanelAvatar::ConfirmModifyRights
 {
 	LLSD args;
-	args["NAME"] = LLSLURL("agent", getAvatarId(), "displayname").getSLURLString();
+	args["NAME"] = LLSLURL("agent", getAvatarId(), "completename").getSLURLString();
 
 	if (grant)
 	{
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 05a413f1a9..6fa92ed7b6 100755
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -1122,7 +1122,9 @@ void LLAvatarListItem::confirmModifyRights(bool grant, S32 rights)
 // Same as llpanelavatar::confirmModifyRights
 {
 	LLSD args;
-	args["NAME"] = LLSLURL("agent", getAvatarId(), "displayname").getSLURLString();
+	// <FS:Ansariel> Always show complete name in rights confirmation dialogs
+	//args["NAME"] = LLSLURL("agent", getAvatarId(), "displayname").getSLURLString();
+	args["NAME"] = LLSLURL("agent", getAvatarId(), "completename").getSLURLString();
 	
 	if (grant)
 	{
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 9e30a26042..be2776fd30 100755
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -706,7 +706,9 @@ void LLAvatarTracker::processChange(LLMessageSystem* msg)
 				if((mBuddyInfo[agent_id]->getRightsGrantedFrom() ^  new_rights) & LLRelationship::GRANT_MODIFY_OBJECTS)
 				{
 					LLSD args;
-					args["NAME"] = LLSLURL("agent", agent_id, "displayname").getSLURLString();
+					// <FS:Ansariel> Always show complete name in rights dialogs
+					//args["NAME"] = LLSLURL("agent", agent_id, "displayname").getSLURLString();
+					args["NAME"] = LLSLURL("agent", agent_id, "completename").getSLURLString();
 					
 					LLSD payload;
 					payload["from_id"] = agent_id;
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index f43e9e07a8..2bfd1b90ce 100755
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -1227,7 +1227,9 @@ void LLPanelGroupMembersSubTab::sendEjectNotifications(const LLUUID& group_id, c
 		for (uuid_vec_t::const_iterator i = selected_members.begin(); i != selected_members.end(); ++i)
 		{
 			LLSD args;
-			args["AVATAR_NAME"] = LLSLURL("agent", *i, "displayname").getSLURLString();
+			// <FS:Ansariel> Always show complete name in rights confirmation dialogs
+			//args["AVATAR_NAME"] = LLSLURL("agent", *i, "displayname").getSLURLString();
+			args["AVATAR_NAME"] = LLSLURL("agent", *i, "completename").getSLURLString();
 			args["GROUP_NAME"] = group_data->mName;
 			
 			LLNotifications::instance().add(LLNotification::Params("EjectAvatarFromGroup").substitutions(args));
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index ce3c3cbebb..1a38747628 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -8518,10 +8518,13 @@ void send_lures(const LLSD& notification, const LLSD& response)
 
 		// Record the offer.
 		{
-			std::string target_name;
-			gCacheName->getFullName(target_id, target_name);  // for im log filenames
+			// <FS:Ansariel> Show complete name for TP lures
+			//std::string target_name;
+			//gCacheName->getFullName(target_id, target_name);  // for im log filenames
 			LLSD args;
-			args["TO_NAME"] = LLSLURL("agent", target_id, "displayname").getSLURLString();;
+			//args["TO_NAME"] = LLSLURL("agent", target_id, "displayname").getSLURLString();;
+			args["TO_NAME"] = LLSLURL("agent", target_id, "completename").getSLURLString();
+			// </FS:Ansariel>
 	
 			LLSD payload;
 				

From 6c2d0240bc09866a7dde74b9a1e1cfe0d2e9bab7 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 16 Dec 2014 15:36:05 +0100
Subject: [PATCH 198/229] Fix annoyance of duplicated rights confirmation
 dialog when checking a checkbox prior selecting the row in legacy friend list

---
 indra/newview/fsfloatercontacts.cpp | 16 +++++++++++++---
 indra/newview/fsfloatercontacts.h   |  3 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp
index 2e5a17ccd7..bb6b6210aa 100644
--- a/indra/newview/fsfloatercontacts.cpp
+++ b/indra/newview/fsfloatercontacts.cpp
@@ -86,7 +86,8 @@ FSFloaterContacts::FSFloaterContacts(const LLSD& seed)
 	mObserver(NULL),
 	mFriendsList(NULL),
 	mGroupList(NULL),
-	mAllowRightsChange(TRUE),
+	mAllowRightsChange(true),
+	mRightsChangeNotificationTriggered(false),
 	mNumRightsChanged(0),
 	mRlvBehaviorCallbackConnection(),
 	mResetLastColumnDisplayModeChanged(false),
@@ -191,6 +192,8 @@ void FSFloaterContacts::draw()
 		mDirtyNames = false;
 	}
 
+	mRightsChangeNotificationTriggered = false;
+
 	LLFloater::draw();
 }
 
@@ -553,11 +556,11 @@ void FSFloaterContacts::onFriendListUpdate(U32 changed_mask)
 				--mNumRightsChanged;
 				if (mNumRightsChanged > 0)
 				{
-					mAllowRightsChange = FALSE;
+					mAllowRightsChange = false;
 				}
 				else
 				{
-					mAllowRightsChange = TRUE;
+					mAllowRightsChange = true;
 				}
 			
 				const std::set<LLUUID>& changed_items = at.getChangedIDs();
@@ -905,6 +908,7 @@ void FSFloaterContacts::confirmModifyRights(rights_map_t& ids, EGrantRevoke comm
 			}
 		}
 	}
+	
 }
 
 bool FSFloaterContacts::modifyRightsConfirmation(const LLSD& notification, const LLSD& response, rights_map_t* rights)
@@ -932,6 +936,11 @@ bool FSFloaterContacts::modifyRightsConfirmation(const LLSD& notification, const
 
 void FSFloaterContacts::applyRightsToFriends()
 {
+	if (mRightsChangeNotificationTriggered)
+	{
+		return;
+	}
+
 	bool rights_changed = false;
 
 	// store modify rights separately for confirmation
@@ -1019,6 +1028,7 @@ void FSFloaterContacts::applyRightsToFriends()
 	if (need_confirmation)
 	{
 		confirmModifyRights(rights_updates, confirmation_type);
+		mRightsChangeNotificationTriggered = true;
 	}
 	else
 	{
diff --git a/indra/newview/fsfloatercontacts.h b/indra/newview/fsfloatercontacts.h
index a923367a79..6364329470 100644
--- a/indra/newview/fsfloatercontacts.h
+++ b/indra/newview/fsfloatercontacts.h
@@ -145,8 +145,9 @@ private:
 	LLTabContainer*			mTabContainer;
 
 	LLFriendObserver*		mObserver;
-	BOOL					mAllowRightsChange;
+	bool					mAllowRightsChange;
 	S32						mNumRightsChanged;
+	bool					mRightsChangeNotificationTriggered;
 
 	std::string				mFriendListFontName;
 

From c3322b2b72d5a677cea1ac1a705a2b18c8179da2 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 16 Dec 2014 15:45:44 +0100
Subject: [PATCH 199/229] On a second thought, let's reset
 mRightsChangeNotificationTriggered in the dialog callback

---
 indra/newview/fsfloatercontacts.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp
index bb6b6210aa..eb76cc7913 100644
--- a/indra/newview/fsfloatercontacts.cpp
+++ b/indra/newview/fsfloatercontacts.cpp
@@ -192,8 +192,6 @@ void FSFloaterContacts::draw()
 		mDirtyNames = false;
 	}
 
-	mRightsChangeNotificationTriggered = false;
-
 	LLFloater::draw();
 }
 
@@ -913,6 +911,8 @@ void FSFloaterContacts::confirmModifyRights(rights_map_t& ids, EGrantRevoke comm
 
 bool FSFloaterContacts::modifyRightsConfirmation(const LLSD& notification, const LLSD& response, rights_map_t* rights)
 {
+	mRightsChangeNotificationTriggered = false;
+
 	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
 	if (0 == option)
 	{

From e818df525ab238ae35a8c380f4985e8616db3712 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 16 Dec 2014 21:01:44 +0100
Subject: [PATCH 200/229] Fix friendlist counter in legacy contact list showing
 [COUNT] placeholder if agent has an empty friendlist

---
 indra/newview/fsfloatercontacts.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp
index eb76cc7913..3992ad980d 100644
--- a/indra/newview/fsfloatercontacts.cpp
+++ b/indra/newview/fsfloatercontacts.cpp
@@ -143,6 +143,8 @@ BOOL FSFloaterContacts::postBuild()
 	mFriendsTab->childSetAction("add_btn",				boost::bind(&FSFloaterContacts::onAddFriendWizButtonClicked,	this));
 	mFriendsTab->setDefaultBtn("im_btn");
 
+	mFriendsTab->getChild<LLTextBox>("friend_count")->setTextArg("COUNT", llformat("%d", mFriendsList->getItemCount()));
+
 	mGroupsTab = getChild<LLPanel>(GROUP_TAB_NAME);
 	mGroupList = mGroupsTab->getChild<LLGroupList>("group_list");
 	mGroupList->setNoItemsMsg(getString("no_groups_msg"));

From 674ccd2d2d4bff544a1d20caab3451d40997202e Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 16 Dec 2014 23:54:47 +0100
Subject: [PATCH 201/229] Cut down logspam if a simstat isn't handled by the
 viewer

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

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 1a38747628..6f930740a3 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6099,7 +6099,10 @@ void process_sim_stats(LLMessageSystem *msg, void **user_data)
 		}
 		else
 		{
-			LL_WARNS() << "Unknown sim stat identifier: " << stat_id << LL_ENDL;
+			// <FS:Ansariel> Cut down logspam
+			//LL_WARNS() << "Unknown sim stat identifier: " << stat_id << LL_ENDL;
+			LL_WARNS_ONCE() << "Unknown sim stat identifier: " << stat_id << LL_ENDL;
+			// </FS:Ansariel>
 		}
 	}
 

From abb02c6c6634f0c5467fcef601e48c0510a9fd9d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 18 Dec 2014 09:51:11 +0100
Subject: [PATCH 202/229] FIRE-15218: Add refresh screenshot button to abuse
 report floater

---
 indra/newview/llfloaterreporter.cpp                 |  3 +++
 .../skins/default/xui/de/floater_report_abuse.xml   |  1 +
 .../skins/default/xui/en/floater_report_abuse.xml   | 13 ++++++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index 15d2d19930..1502acd488 100755
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -178,6 +178,9 @@ BOOL LLFloaterReporter::postBuild()
 	std::string reporter = LLSLURL("agent", gAgent.getID(), "inspect").getSLURLString();
 	getChild<LLUICtrl>("reporter_field")->setValue(reporter);
 	
+	// <FS:Ansariel> FIRE-15218: Refresh screenshot button
+	getChild<LLButton>("refresh_screenshot")->setCommitCallback(boost::bind(&LLFloaterReporter::takeScreenshot, this));
+
 	center();
 
 	return TRUE;
diff --git a/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
index 6200bf4934..550e432e54 100755
--- a/indra/newview/skins/default/xui/de/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
@@ -3,6 +3,7 @@
 	<floater.string name="Screenshot">
 		Foto
 	</floater.string>
+	<button name="refresh_screenshot" tool_tip="Foto aktualisieren"/>
 	<check_box bottom_delta="-20" label="Dieses Foto verwenden" name="screen_check"/>
 	<text name="reporter_title">
 		Melder:
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index a99294dab1..00a2b8a128 100755
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -21,13 +21,24 @@
      name="screenshot"
      top="15"
      width="220" />
+     <button
+     follows="top|left"
+     halign="center"
+     height="23"
+     image_overlay="Refresh_Off"
+     layout="topleft"
+     tool_tip="Refresh Screenshot"
+     name="refresh_screenshot"
+     left_pad="5"
+     top="121"
+     width="25"/>
     <check_box
      height="15"
      label="Use this screenshot"
      layout="topleft"
      left="8"
      name="screen_check"
-     top_pad="-12"
+     top_pad="5"
      width="116" />
     <text
      type="string"

From 0d4a1ae9df3dfeaacfc7b6fbf3faf4bc8674905e Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 18 Dec 2014 15:03:38 +0100
Subject: [PATCH 203/229] FIRE-15194: Avatar picker doesn't work anymore when
 using legacy simulator messages

---
 indra/newview/llfloateravatarpicker.cpp | 26 ++++++++++++++++++++++++-
 indra/newview/llfloateravatarpicker.h   |  5 +++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index 2e226a377a..2d292bcc85 100755
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -65,6 +65,9 @@
 //put it back as a member once the legacy path is out?
 static std::map<LLUUID, LLAvatarName> sAvatarNameMap;
 
+// <FS:Ansariel> FIRE-15194: Avatar picker doesn't work anymore when using legacy simulator messages
+LLFloaterAvatarPicker::query_id_name_map_t LLFloaterAvatarPicker::sQueryNameMap;
+
 LLFloaterAvatarPicker* LLFloaterAvatarPicker::show(select_callback_t callback,
 												   BOOL allow_multiple,
 												   BOOL closeOnSelect,
@@ -219,6 +222,14 @@ LLFloaterAvatarPicker::~LLFloaterAvatarPicker()
 	}
 	// </FS:Ansariel>
 
+	// <FS:Ansariel> FIRE-15194: Avatar picker doesn't work anymore when using legacy simulator messages
+	query_id_name_map_t::iterator found = sQueryNameMap.find(mQueryID);
+	if (found != sQueryNameMap.end())
+	{
+		sQueryNameMap.erase(found);
+	}
+	// </FS:Ansariel>
+
 	gFocusMgr.releaseFocusIfNeeded( this );
 }
 
@@ -648,6 +659,9 @@ void LLFloaterAvatarPicker::find()
 	}
 	else
 	{
+		// <FS:Ansariel> FIRE-15194: Avatar picker doesn't work anymore when using legacy simulator messages
+		sQueryNameMap[mQueryID] = getKey().asString();
+
 		LLMessageSystem* msg = gMessageSystem;
 		msg->newMessage("AvatarPickerRequest");
 		msg->nextBlock("AgentData");
@@ -774,7 +788,17 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void*
 	// Not for us
 	if (agent_id != gAgent.getID()) return;
 	
-	LLFloaterAvatarPicker* floater = LLFloaterReg::findTypedInstance<LLFloaterAvatarPicker>("avatar_picker");
+	// <FS:Ansariel> FIRE-15194: Avatar picker doesn't work anymore when using legacy simulator messages
+	//LLFloaterAvatarPicker* floater = LLFloaterReg::findTypedInstance<LLFloaterAvatarPicker>("avatar_picker");
+	query_id_name_map_t::iterator found = sQueryNameMap.find(query_id);
+	if (found == sQueryNameMap.end())
+	{
+		return;
+	}
+	std::string floater_key = LLSD(found->second);
+	sQueryNameMap.erase(found);
+	LLFloaterAvatarPicker* floater = LLFloaterReg::findTypedInstance<LLFloaterAvatarPicker>("avatar_picker", floater_key);
+	// </FS:Ansariel>
 
 	// floater is closed or these are not results from our last request
 	if (NULL == floater || query_id != floater->mQueryID)
diff --git a/indra/newview/llfloateravatarpicker.h b/indra/newview/llfloateravatarpicker.h
index 565fb15e3d..38ef55ecee 100755
--- a/indra/newview/llfloateravatarpicker.h
+++ b/indra/newview/llfloateravatarpicker.h
@@ -68,6 +68,11 @@ public:
 	void openFriendsTab();
 	BOOL isExcludeAgentFromSearchResults() {return mExcludeAgentFromSearchResults;}
 
+	// <FS:Ansariel> FIRE-15194: Avatar picker doesn't work anymore when using legacy simulator messages
+	typedef std::map<LLUUID, std::string> query_id_name_map_t;
+	static query_id_name_map_t sQueryNameMap;
+	// </FS:Ansariel>
+
 private:
 	void editKeystroke(class LLLineEditor* caller, void* user_data);
 	// <FS:Ansariel> Search by UUID

From 45a26b96b3390f5319fab3481adfd6b59c96c21a Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 18 Dec 2014 15:28:57 +0100
Subject: [PATCH 204/229] FIRE-15189: Fix ClickToWalk not allowing mouse-walk
 (behavior change)

Fixed the click to walk feature not allowing the mouse-walk, with help from Lirusaito Faers (Singularity viewer)

This will case a slightly different behavior when click to walk is enabled: If the
avatar is walking, you click on the avatar and move the mouse, the camera will
be able to rotate on all 3 axis instead of only the x-axis.
---
 indra/newview/lltoolpie.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 8298570f4d..204247db17 100755
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -384,7 +384,10 @@ BOOL LLToolPie::handleLeftClickPick()
 			}
 			object = (LLViewerObject*)object->getParent();
 		}
-		if (object && object == gAgentAvatarp && !gSavedSettings.getBOOL("ClickToWalk"))
+		// <FS:Ansariel> FIRE-15189: Fix ClickToWalk not allowing mouse-walk (behavior change)
+		//if (object && object == gAgentAvatarp && !gSavedSettings.getBOOL("ClickToWalk"))
+		if (object && object == gAgentAvatarp)
+		// </FS:Ansariel>
 		{
 			// we left clicked on avatar, switch to focus mode
 			mMouseButtonDown = false;

From 90e207715f1b6a356154c0965a4c30318720dce8 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 18 Dec 2014 16:18:55 +0100
Subject: [PATCH 205/229] FIRE-15204: Viewer crashes when clicking "upload
 model" quickly twice then closing both filepickers

---
 indra/newview/llfloatermodelpreview.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 2477612780..3bddef1683 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -659,6 +659,13 @@ void LLFloaterModelPreview::disableViewOption(const std::string& option)
 
 void LLFloaterModelPreview::loadModel(S32 lod)
 {
+	// <FS:Ansariel> FIRE-15204: Viewer crashes when clicking "upload model" quickly twice then closing both filepickers
+	if (mModelPreview->mLoading)
+	{
+		return;
+	}
+	// </FS:Ansariel>
+
 	mModelPreview->mLoading = true;
 
 	(new LLMeshFilePicker(mModelPreview, lod))->getFile();
@@ -666,6 +673,13 @@ void LLFloaterModelPreview::loadModel(S32 lod)
 
 void LLFloaterModelPreview::loadModel(S32 lod, const std::string& file_name, bool force_disable_slm)
 {
+	// <FS:Ansariel> FIRE-15204: Viewer crashes when clicking "upload model" quickly twice then closing both filepickers
+	if (mModelPreview->mLoading)
+	{
+		return;
+	}
+	// </FS:Ansariel>
+
 	mModelPreview->mLoading = true;
 
 	mModelPreview->loadModel(file_name, lod, force_disable_slm);

From c8fe7f2332235025aa657d046860d59733947f50 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 18 Dec 2014 16:45:31 +0100
Subject: [PATCH 206/229] Fix some unnecessary casting accidentally added

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

diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index 2d292bcc85..c9bf8da54e 100755
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -795,7 +795,7 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void*
 	{
 		return;
 	}
-	std::string floater_key = LLSD(found->second);
+	const LLSD floater_key(found->second);
 	sQueryNameMap.erase(found);
 	LLFloaterAvatarPicker* floater = LLFloaterReg::findTypedInstance<LLFloaterAvatarPicker>("avatar_picker", floater_key);
 	// </FS:Ansariel>

From b8a195ad8cfca0fda6611efc357e018f8856ff5f Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Thu, 18 Dec 2014 19:25:41 +0100
Subject: [PATCH 207/229] Updated Polish translation

---
 indra/newview/skins/default/xui/pl/floater_report_abuse.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
index 35dc64f5dd..100cd5870a 100755
--- a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
@@ -3,6 +3,7 @@
 	<floater.string name="Screenshot">
 		Zdjęcie ekranu
 	</floater.string>
+	<button tool_tip="Odśwież zdjęcie" name="refresh_screenshot"/>
 	<check_box label="Załącz zdjęcie" name="screen_check"/>
 	<text name="reporter_title">
 		Zgłasza:

From 1ef3b59c2f776ab9bbc864e0857dd49aab9c2c2d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 19 Dec 2014 10:55:28 +0100
Subject: [PATCH 208/229] FIRE-15226: Select and scroll to newly created mute
 by name

---
 indra/newview/fspanelblocklist.cpp | 8 ++++++--
 indra/newview/fspanelblocklist.h   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/indra/newview/fspanelblocklist.cpp b/indra/newview/fspanelblocklist.cpp
index 49c26bc467..ce1a0d0469 100644
--- a/indra/newview/fspanelblocklist.cpp
+++ b/indra/newview/fspanelblocklist.cpp
@@ -307,7 +307,7 @@ void FSPanelBlockList::blockResidentByName()
 
 void FSPanelBlockList::blockObjectByName()
 {
-	LLFloaterGetBlockedObjectName* picker = LLFloaterGetBlockedObjectName::show(&FSPanelBlockList::callbackBlockByName);
+	LLFloaterGetBlockedObjectName* picker = LLFloaterGetBlockedObjectName::show(boost::bind(&FSPanelBlockList::callbackBlockByName, this, _1));
 	LLFloater* parent = dynamic_cast<LLFloater*>(getParent());
 	if (parent)
 	{
@@ -338,7 +338,6 @@ void FSPanelBlockList::callbackBlockPicked(const uuid_vec_t& ids, const std::vec
 	showPanelAndSelect(mute.mID);
 }
 
-//static
 void FSPanelBlockList::callbackBlockByName(const std::string& text)
 {
 	if (text.empty()) return;
@@ -349,6 +348,11 @@ void FSPanelBlockList::callbackBlockByName(const std::string& text)
 	{
 		LLNotificationsUtil::add("MuteByNameFailed");
 	}
+	else
+	{
+		mBlockedList->selectItemByLabel(text);
+		mBlockedList->scrollToShowSelected();
+	}
 }
 
 void FSPanelBlockList::onFilterEdit(std::string search_string)
diff --git a/indra/newview/fspanelblocklist.h b/indra/newview/fspanelblocklist.h
index be4d6d2b00..4113f5f096 100644
--- a/indra/newview/fspanelblocklist.h
+++ b/indra/newview/fspanelblocklist.h
@@ -90,7 +90,7 @@ private:
 	bool isActionEnabled(const LLSD& userdata);
 
 	void callbackBlockPicked(const uuid_vec_t& ids, const std::vector<LLAvatarName> names);
-	static void callbackBlockByName(const std::string& text);
+	void callbackBlockByName(const std::string& text);
 
 private:
 	FSBlockListCtrl* mBlockedList;

From ee8d71c1700630863848f28225106228f057a2f7 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 19 Dec 2014 15:58:49 +0100
Subject: [PATCH 209/229] Only check for LSL bridge script name when actually
 creating the bridge instead of everytime a script is being uploaded

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

diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index e9504c6f05..cc737aee2b 100755
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -617,9 +617,10 @@ void LLUpdateAgentInventoryResponder::uploadComplete(const LLSD& content)
 			  }
 		  }
 		// <FS:TT> Client LSL Bridge
-		if (FSLSLBridge::instance().canUseBridge())
+		FSLSLBridge& fs_bridge = FSLSLBridge::instance();
+		if (fs_bridge.canUseBridge() && fs_bridge.getBridgeCreating())
 		{
-			FSLSLBridge::instance().checkBridgeScriptName(mFileName);
+			fs_bridge.checkBridgeScriptName(mFileName);
 		}
 		// </FS:TT>
 		  break;

From d6b432edf9b6ad2e8134eeae0fe20a1801909a36 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 30 Dec 2014 21:26:54 +0100
Subject: [PATCH 210/229] FIRE-15299: Chat font size change does not apply in
 nearby chat history floater; Also make change instantly visible without the
 need of emptying the text input

---
 indra/newview/fsfloaterim.cpp         | 5 +++++
 indra/newview/fsfloaternearbychat.cpp | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp
index 72dd5d2730..b6a50d9a54 100644
--- a/indra/newview/fsfloaterim.cpp
+++ b/indra/newview/fsfloaterim.cpp
@@ -1468,6 +1468,11 @@ void FSFloaterIM::processChatHistoryStyleUpdate(const LLSD& newvalue)
 		{
 			floater->updateChatHistoryStyle();
 			floater->mInputEditor->setFont(font);
+
+			// Re-set the current text to make style update instant
+			std::string text = floater->mInputEditor->getText();
+			floater->mInputEditor->clear();
+			floater->mInputEditor->setText(text);
 		}
 	}
 }
diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index 6f1ce7d9e4..3e3df56dad 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -495,6 +495,12 @@ void FSFloaterNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue)
 	if (nearby_chat)
 	{
 		nearby_chat->updateChatHistoryStyle();
+		nearby_chat->mInputEditor->setFont(LLViewerChat::getChatFont());
+
+		// Re-set the current text to make style update instant
+		std::string text = nearby_chat->mInputEditor->getText();
+		nearby_chat->mInputEditor->clear();
+		nearby_chat->mInputEditor->setText(text);
 	}
 }
 

From eb9269863f8e8ab27b1d5668b772106ff355d80e Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 5 Jan 2015 10:10:28 +0100
Subject: [PATCH 211/229] FIRE-7514: Script in external editor needs to be
 saved twice to be updated in internal editor

---
 indra/newview/fslslpreproc.cpp    |  5 +--
 indra/newview/fslslpreproc.h      |  5 +--
 indra/newview/llpreviewscript.cpp | 58 ++++++++++++++++++++++---------
 indra/newview/llpreviewscript.h   | 27 ++++++++++----
 4 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/indra/newview/fslslpreproc.cpp b/indra/newview/fslslpreproc.cpp
index 5c8f22739c..6f7c51c7f8 100644
--- a/indra/newview/fslslpreproc.cpp
+++ b/indra/newview/fslslpreproc.cpp
@@ -672,9 +672,10 @@ void FSLSLPreprocessor::FSProcCacheCallback(LLVFS *vfs, const LLUUID& iuuid, LLA
 	}
 }
 
-void FSLSLPreprocessor::preprocess_script(BOOL close, BOOL defcache)
+void FSLSLPreprocessor::preprocess_script(BOOL close, bool sync, BOOL defcache)
 {
 	mClose = close;
+	mSync = sync;
 	mDefinitionCaching = defcache;
 	caching_files.clear();
 	mCore->mErrorList->setCommentText(std::string("PreProc Starting..."));
@@ -1156,7 +1157,7 @@ void FSLSLPreprocessor::start_process()
 			outfield->setText(LLStringExplicit(output));
 		}
 		mCore->mPostScript = output;
-		mCore->doSaveComplete((void*)mCore,mClose);
+		mCore->doSaveComplete((void*)mCore,mClose,mSync);
 	}
 	mWaving = FALSE;
 }
diff --git a/indra/newview/fslslpreproc.h b/indra/newview/fslslpreproc.h
index 17bf9ffc93..7b1222518d 100644
--- a/indra/newview/fslslpreproc.h
+++ b/indra/newview/fslslpreproc.h
@@ -46,7 +46,7 @@ class FSLSLPreprocessor
 public:
 
 	FSLSLPreprocessor(LLScriptEdCore* corep)
-		: mCore(corep), mWaving(FALSE), mClose(FALSE)
+		: mCore(corep), mWaving(FALSE), mClose(FALSE), mSync(false)
 	{}
 
 	static bool mono_directive(std::string const& text, bool agent_inv = true);
@@ -59,7 +59,7 @@ public:
 	static LLUUID findInventoryByName(std::string name);
 	static void FSProcCacheCallback(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type,
 									void *userdata, S32 result, LLExtStat extstat);
-	void preprocess_script(BOOL close = FALSE, BOOL defcache = FALSE);
+	void preprocess_script(BOOL close = FALSE, bool sync = false, BOOL defcache = FALSE);
 	void start_process();
 	void display_error(std::string err);
 
@@ -86,6 +86,7 @@ public:
 	LLScriptEdCore* mCore;
 	BOOL mWaving;
 	BOOL mClose;
+	bool mSync;
 	BOOL mHDDInclude;
 	std::string mMainScriptName;
 };
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 3264c4ee8f..ebec9a29f6 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -400,7 +400,10 @@ LLScriptEdCore::LLScriptEdCore(
 	const std::string& sample,
 	const LLHandle<LLFloater>& floater_handle,
 	void (*load_callback)(void*),
-	void (*save_callback)(void*, BOOL),
+	// <FS:Ansariel> FIRE-7514: Script in external editor needs to be saved twice
+	//void (*save_callback)(void*, BOOL),
+	void (*save_callback)(void*, BOOL, bool),
+	// </FS:Ansariel>
 	void (*search_replace_callback) (void* userdata),
 	void* userdata,
 	S32 bottom_pad)
@@ -620,7 +623,10 @@ void LLScriptEdCore::initMenu()
 	LLMenuItemCallGL* menuItem;
 	
 	menuItem = getChild<LLMenuItemCallGL>("Save");
-	menuItem->setClickCallback(boost::bind(&LLScriptEdCore::doSave, this, FALSE));
+	// <FS:Ansariel> FIRE-7514: Script in external editor needs to be saved twice
+	//menuItem->setClickCallback(boost::bind(&LLScriptEdCore::doSave, this, FALSE));
+	menuItem->setClickCallback(boost::bind(&LLScriptEdCore::doSave, this, FALSE, true));
+	// </FS:Ansariel>
 	menuItem->setEnableCallback(boost::bind(&LLScriptEdCore::hasChanged, this));
 	
 	menuItem = getChild<LLMenuItemCallGL>("Revert All Changes");
@@ -685,8 +691,8 @@ void LLScriptEdCore::initMenu()
 
 void LLScriptEdCore::initButtonBar()
 {
-	mSaveBtn->setClickedCallback(boost::bind(&LLScriptEdCore::doSave, this, FALSE));
-	mSaveBtn2->setClickedCallback(boost::bind(&LLScriptEdCore::doSave, this, FALSE));	// <FS:Zi> support extra save button
+	mSaveBtn->setClickedCallback(boost::bind(&LLScriptEdCore::doSave, this, FALSE, true));
+	mSaveBtn2->setClickedCallback(boost::bind(&LLScriptEdCore::doSave, this, FALSE, true));	// <FS:Zi> support extra save button
 	mCutBtn->setClickedCallback(boost::bind(&LLTextEditor::cut, mEditor));
 	mCopyBtn->setClickedCallback(boost::bind(&LLTextEditor::copy, mEditor));
 	mPasteBtn->setClickedCallback(boost::bind(&LLTextEditor::paste, mEditor));
@@ -1197,26 +1203,29 @@ void LLScriptEdCore::onBtnInsertFunction(LLUICtrl *ui, void* userdata)
 	self->setHelpPage(self->mFunctions->getSimple());
 }
 
-void LLScriptEdCore::doSave( BOOL close_after_save )
+// <FS:Ansariel> FIRE-7514: Script in external editor needs to be saved twice
+//void LLScriptEdCore::doSave( BOOL close_after_save )
+void LLScriptEdCore::doSave(BOOL close_after_save, bool sync /*= true*/)
+// </FS:Ansariel>
 {
 	// NaCl - LSL Preprocessor
 	if (mLSLProc && gSavedSettings.getBOOL("_NACL_LSLPreprocessor"))
 	{
 		LL_INFOS() << "passing to preproc" << LL_ENDL;
-		mLSLProc->preprocess_script(close_after_save);
+		mLSLProc->preprocess_script(close_after_save, sync);
 	}
 	else
 	{
 		if( mSaveCallback )
 		{
-			mSaveCallback( mUserdata, close_after_save );
+			mSaveCallback( mUserdata, close_after_save, sync );
 		}
 	}
 	// NaCl End
 }
 
 // NaCl - LSL Preprocessor
-void LLScriptEdCore::doSaveComplete( void* userdata, BOOL close_after_save )
+void LLScriptEdCore::doSaveComplete( void* userdata, BOOL close_after_save, bool sync)
 {
 	add( LLStatViewer::LSL_SAVES,1 );
 
@@ -1224,7 +1233,7 @@ void LLScriptEdCore::doSaveComplete( void* userdata, BOOL close_after_save )
 
 	if( mSaveCallback )
 	{
-		mSaveCallback( mUserdata, close_after_save );
+		mSaveCallback( mUserdata, close_after_save, sync );
 	}
 }
 // NaCl End
@@ -1474,7 +1483,10 @@ void LLScriptEdCore::onBtnSaveToFile( void* userdata )
 			std::ofstream fout(filename.c_str());
 			fout<<(scriptText);
 			fout.close();
-			self->mSaveCallback( self->mUserdata, FALSE );
+			// <FS:Ansariel> FIRE-7514: Script in external editor needs to be saved twice
+			//self->mSaveCallback( self->mUserdata, FALSE );
+			self->mSaveCallback( self->mUserdata, FALSE, true );
+			// </FS:Ansariel>
 		}
 	}
 }
@@ -1597,8 +1609,10 @@ bool LLScriptEdContainer::onExternalChange(const std::string& filename)
 	}
 
 	// Disable sync to avoid recursive load->save->load calls.
-	mScriptEd->doSave(FALSE);
-	saveIfNeeded(false);
+	// <FS> LSL preprocessor
+	//saveIfNeeded(false);
+	mScriptEd->doSave(FALSE, false);
+	// </FS>
 	return true;
 }
 
@@ -1801,11 +1815,17 @@ void LLPreviewLSL::onLoad(void* userdata)
 }
 
 // static
-void LLPreviewLSL::onSave(void* userdata, BOOL close_after_save)
+// <FS:Ansariel> FIRE-7514: Script in external editor needs to be saved twice
+//void LLPreviewLSL::onSave(void* userdata, BOOL close_after_save)
+void LLPreviewLSL::onSave(void* userdata, BOOL close_after_save, bool sync)
+// </FS:Ansariel>
 {
 	LLPreviewLSL* self = (LLPreviewLSL*)userdata;
 	self->mCloseAfterSave = close_after_save;
-	self->saveIfNeeded();
+	// <FS:Ansariel> FIRE-7514: Script in external editor needs to be saved twice
+	//self->saveIfNeeded();
+	self->saveIfNeeded(sync);
+	// </FS:Ansariel>
 }
 
 // Save needs to compile the text in the buffer. If the compile
@@ -2907,12 +2927,18 @@ void LLLiveLSLEditor::onLoad(void* userdata)
 }
 
 // static
-void LLLiveLSLEditor::onSave(void* userdata, BOOL close_after_save)
+// <FS:Ansariel> FIRE-7514: Script in external editor needs to be saved twice
+//void LLLiveLSLEditor::onSave(void* userdata, BOOL close_after_save)
+void LLLiveLSLEditor::onSave(void* userdata, BOOL close_after_save, bool sync)
+// </FS:Ansariel>
 {
 	LLLiveLSLEditor* self = (LLLiveLSLEditor*)userdata;
 
 	self->mCloseAfterSave = close_after_save;
-	self->saveIfNeeded();
+	// <FS:Ansariel> FIRE-7514: Script in external editor needs to be saved twice
+	//self->saveIfNeeded();
+	self->saveIfNeeded(sync);
+	// </FS:Ansariel>
 }
 
 
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index d3e2d69325..49885bd0b3 100755
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -77,7 +77,10 @@ protected:
 		const std::string& sample,
 		const LLHandle<LLFloater>& floater_handle,
 		void (*load_callback)(void* userdata),
-		void (*save_callback)(void* userdata, BOOL close_after_save),
+		// <FS:Ansariel> FIRE-7514: Script in external editor needs to be saved twice
+		//void (*save_callback)(void* userdata, BOOL close_after_save),
+		void (*save_callback)(void* userdata, BOOL close_after_save, bool sync),
+		// </FS:Ansariel>
 		void (*search_replace_callback)(void* userdata),
 		void* userdata,
 		S32 bottom_pad = 0);	// pad below bottom row of buttons
@@ -95,13 +98,16 @@ public:
 	void            setScriptText(const std::string& text, BOOL is_valid);
 	// NaCL - LSL Preprocessor
 	std::string		getScriptText();
-	void			doSaveComplete(void* userdata, BOOL close_after_save );
+	void			doSaveComplete(void* userdata, BOOL close_after_save, bool sync);
 	// NaCl End
 	bool			loadScriptText(const std::string& filename);
 	bool			writeToFile(const std::string& filename, bool unprocessed);
 	void			sync();
 	
-	void			doSave( BOOL close_after_save );
+	// <FS:Ansariel> FIRE-7514: Script in external editor needs to be saved twice
+	//void			doSave( BOOL close_after_save );
+	void			doSave(BOOL close_after_save, bool sync = true);
+	// </FS:Ansariel>
 
 	bool			handleSaveChangesDialog(const LLSD& notification, const LLSD& response);
 	bool			handleReloadFromServerDialog(const LLSD& notification, const LLSD& response);
@@ -155,7 +161,10 @@ private:
 	std::string		mSampleText;
 	LLTextEditor*	mEditor;
 	void			(*mLoadCallback)(void* userdata);
-	void			(*mSaveCallback)(void* userdata, BOOL close_after_save);
+	// <FS:Ansariel> FIRE-7514: Script in external editor needs to be saved twice
+	//void			(*mSaveCallback)(void* userdata, BOOL close_after_save);
+	void			(*mSaveCallback)(void* userdata, BOOL close_after_save, bool sync);
+	// </FS:Ansariel>
 	void			(*mSearchReplaceCallback) (void* userdata);
 	void*			mUserdata;
 	LLComboBox		*mFunctions;
@@ -254,7 +263,10 @@ protected:
 
 	static void onSearchReplace(void* userdata);
 	static void onLoad(void* userdata);
-	static void onSave(void* userdata, BOOL close_after_save);
+	// <FS:Ansariel> FIRE-7514: Script in external editor needs to be saved twice
+	//static void onSave(void* userdata, BOOL close_after_save);
+	static void onSave(void* userdata, BOOL close_after_save, bool sync);
+	// </FS:Ansariel>
 	
 	static void onLoadComplete(LLVFS *vfs, const LLUUID& uuid,
 							   LLAssetType::EType type,
@@ -327,7 +339,10 @@ private:
 
 	static void onSearchReplace(void* userdata);
 	static void onLoad(void* userdata);
-	static void onSave(void* userdata, BOOL close_after_save);
+	// <FS:Ansariel> FIRE-7514: Script in external editor needs to be saved twice
+	//static void onSave(void* userdata, BOOL close_after_save);
+	static void onSave(void* userdata, BOOL close_after_save, bool sync);
+	// </FS:Ansariel>
 
 	static void onLoadComplete(LLVFS *vfs, const LLUUID& asset_uuid,
 							   LLAssetType::EType type,

From 2c00bda40493b8c5dc75ad0f4187ce51b972a1cf Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 5 Jan 2015 10:26:47 +0100
Subject: [PATCH 212/229] Added some explanatory comment for previous commit

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

diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index ebec9a29f6..d543e4c029 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -1610,6 +1610,10 @@ bool LLScriptEdContainer::onExternalChange(const std::string& filename)
 
 	// Disable sync to avoid recursive load->save->load calls.
 	// <FS> LSL preprocessor
+	// Ansariel: Don't call saveIfNeeded directly, as we might have to run the
+	// preprocessor first. saveIfNeeded will be invoked via callback. Make sure
+	// to pass sync = false - we don't need to update the external editor in this
+	// case or the next save will be ignored!
 	//saveIfNeeded(false);
 	mScriptEd->doSave(FALSE, false);
 	// </FS>

From 0711db4e94b21b41fe737be5e51144862d625e3b Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 5 Jan 2015 10:32:05 +0100
Subject: [PATCH 213/229] FIRE-15311: FocusOffsetRearView, FocusOffsetFrontView
 & FocusOffsetGroupView debug settings are not included in settings backup

---
 indra/newview/app_settings/settings.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index cc3b469b74..b6f4049b05 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6288,8 +6288,6 @@
         <real>0.0</real>
         <real>1.0</real>
       </array>
-      <key>Backup</key>
-      <integer>0</integer>
     </map>
     <key>FocusOffsetFrontView</key>
     <map>
@@ -6305,8 +6303,6 @@
         <real>0.0</real>
         <real>0.0</real>
       </array>
-      <key>Backup</key>
-      <integer>0</integer>
     </map>
     <key>FocusOffsetGroupView</key>
     <map>
@@ -6322,8 +6318,6 @@
         <real>0.7</real>
         <real>1.0</real>
       </array>
-      <key>Backup</key>
-      <integer>0</integer>
     </map>
     <key>FocusPosOnLogout</key>
     <map>

From 8c45ccc81d22cf329b45b839ee5b72814fbe95b8 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 5 Jan 2015 13:02:24 +0100
Subject: [PATCH 214/229] Some refactoring for stuff that caught my eye...

---
 indra/newview/NACLfloaterexploresounds.cpp |   2 +-
 indra/newview/fsfloateraddtocontactset.cpp |   4 +-
 indra/newview/fslslbridgerequest.cpp       |   2 +-
 indra/newview/particleeditor.cpp           | 542 +++++++++++----------
 indra/newview/particleeditor.h             |  10 +-
 indra/newview/sanitycheck.cpp              |  30 +-
 6 files changed, 299 insertions(+), 291 deletions(-)

diff --git a/indra/newview/NACLfloaterexploresounds.cpp b/indra/newview/NACLfloaterexploresounds.cpp
index 7c9026ab28..7ae9bf9ee7 100644
--- a/indra/newview/NACLfloaterexploresounds.cpp
+++ b/indra/newview/NACLfloaterexploresounds.cpp
@@ -88,7 +88,7 @@ BOOL NACLFloaterExploreSounds::postBuild()
 
 void NACLFloaterExploreSounds::handleSelection()
 {
-	S32 num_selected = mHistoryScroller->getAllSelected().size();
+	size_t num_selected = mHistoryScroller->getAllSelected().size();
 	bool multiple = (num_selected > 1);
 	childSetEnabled("look_at_btn", (num_selected && !multiple));
 	childSetEnabled("play_locally_btn", num_selected);
diff --git a/indra/newview/fsfloateraddtocontactset.cpp b/indra/newview/fsfloateraddtocontactset.cpp
index 3d972968e2..b5b07370f1 100644
--- a/indra/newview/fsfloateraddtocontactset.cpp
+++ b/indra/newview/fsfloateraddtocontactset.cpp
@@ -43,9 +43,9 @@ FSFloaterAddToContactSet::FSFloaterAddToContactSet(const LLSD& target)
 	if (target.isArray())
 	{
 		mHasMultipleAgents = true;
-		for (S32 i = 0; i < target.size(); ++i)
+		for (LLSD::array_const_iterator it = target.beginArray(); it != target.endArray(); ++it)
 		{
-			mAgentIDs.push_back(target[i].asUUID());
+			mAgentIDs.push_back((*it).asUUID());
 		}
 	}
 	else
diff --git a/indra/newview/fslslbridgerequest.cpp b/indra/newview/fslslbridgerequest.cpp
index 8baa612a58..58a81c9281 100644
--- a/indra/newview/fslslbridgerequest.cpp
+++ b/indra/newview/fslslbridgerequest.cpp
@@ -89,7 +89,7 @@ void FSLSLBridgeRequestRadarPosResponder::result(const LLSD& content)
 			FSRadarEntry* entry = radar->getEntry(targetAv);
 			if (entry)
 			{
-				entry->setZOffset((F32)(targetZ));
+				entry->setZOffset(targetZ);
 				//LL_INFOS() << targetAv << " ::: " << targetZ << LL_ENDL;
 			}
 		}
diff --git a/indra/newview/particleeditor.cpp b/indra/newview/particleeditor.cpp
index 31ab7678d9..5bd46077b2 100644
--- a/indra/newview/particleeditor.cpp
+++ b/indra/newview/particleeditor.cpp
@@ -57,39 +57,39 @@ ParticleEditor::ParticleEditor(const LLSD& key)
 	mObject(0),
 	mParticleScriptInventoryItem(0)
 {
-	mPatternMap["drop"]=LLPartSysData::LL_PART_SRC_PATTERN_DROP;
-	mPatternMap["explode"]=LLPartSysData::LL_PART_SRC_PATTERN_EXPLODE;
-	mPatternMap["angle"]=LLPartSysData::LL_PART_SRC_PATTERN_ANGLE;
-	mPatternMap["angle_cone"]=LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE;
-	mPatternMap["angle_cone_empty"]=LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY;
+	mPatternMap["drop"] = LLPartSysData::LL_PART_SRC_PATTERN_DROP;
+	mPatternMap["explode"] = LLPartSysData::LL_PART_SRC_PATTERN_EXPLODE;
+	mPatternMap["angle"] = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE;
+	mPatternMap["angle_cone"] = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE;
+	mPatternMap["angle_cone_empty"] = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY;
 
-	mScriptPatternMap["drop"]="PSYS_SRC_PATTERN_DROP";
-	mScriptPatternMap["explode"]="PSYS_SRC_PATTERN_EXPLODE";
-	mScriptPatternMap["angle"]="PSYS_SRC_PATTERN_ANGLE";
-	mScriptPatternMap["angle_cone"]="PSYS_SRC_PATTERN_ANGLE_CONE";
-	mScriptPatternMap["angle_cone_empty"]="PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY";
+	mScriptPatternMap["drop"] = "PSYS_SRC_PATTERN_DROP";
+	mScriptPatternMap["explode"] = "PSYS_SRC_PATTERN_EXPLODE";
+	mScriptPatternMap["angle"] = "PSYS_SRC_PATTERN_ANGLE";
+	mScriptPatternMap["angle_cone"] = "PSYS_SRC_PATTERN_ANGLE_CONE";
+	mScriptPatternMap["angle_cone_empty"] = "PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY";
 
-	mBlendMap["blend_one"]=LLPartData::LL_PART_BF_ONE;
-	mBlendMap["blend_zero"]=LLPartData::LL_PART_BF_ZERO;
-	mBlendMap["blend_dest_color"]=LLPartData::LL_PART_BF_DEST_COLOR;
-	mBlendMap["blend_src_color"]=LLPartData::LL_PART_BF_SOURCE_COLOR;
-	mBlendMap["blend_one_minus_dest_color"]=LLPartData::LL_PART_BF_ONE_MINUS_DEST_COLOR;
-	mBlendMap["blend_one_minus_src_color"]=LLPartData::LL_PART_BF_ONE_MINUS_SOURCE_COLOR;
-	mBlendMap["blend_src_alpha"]=LLPartData::LL_PART_BF_SOURCE_ALPHA;
-	mBlendMap["blend_one_minus_src_alpha"]=LLPartData::LL_PART_BF_ONE_MINUS_SOURCE_ALPHA;
+	mBlendMap["blend_one"] = LLPartData::LL_PART_BF_ONE;
+	mBlendMap["blend_zero"] = LLPartData::LL_PART_BF_ZERO;
+	mBlendMap["blend_dest_color"] = LLPartData::LL_PART_BF_DEST_COLOR;
+	mBlendMap["blend_src_color"] = LLPartData::LL_PART_BF_SOURCE_COLOR;
+	mBlendMap["blend_one_minus_dest_color"] = LLPartData::LL_PART_BF_ONE_MINUS_DEST_COLOR;
+	mBlendMap["blend_one_minus_src_color"] = LLPartData::LL_PART_BF_ONE_MINUS_SOURCE_COLOR;
+	mBlendMap["blend_src_alpha"] = LLPartData::LL_PART_BF_SOURCE_ALPHA;
+	mBlendMap["blend_one_minus_src_alpha"] = LLPartData::LL_PART_BF_ONE_MINUS_SOURCE_ALPHA;
 
-	mScriptBlendMap["blend_one"]="PSYS_PART_BF_ONE";
-	mScriptBlendMap["blend_zero"]="PSYS_PART_BF_ZERO";
-	mScriptBlendMap["blend_dest_color"]="PSYS_PART_BF_DEST_COLOR";
-	mScriptBlendMap["blend_src_color"]="PSYS_PART_BF_SOURCE_COLOR";
-	mScriptBlendMap["blend_one_minus_dest_color"]="PSYS_PART_BF_ONE_MINUS_DEST_COLOR";
-	mScriptBlendMap["blend_one_minus_src_color"]="PSYS_PART_BF_ONE_MINUS_SOURCE_COLOR";
-	mScriptBlendMap["blend_src_alpha"]="PSYS_PART_BF_SOURCE_ALPHA";
-	mScriptBlendMap["blend_one_minus_src_alpha"]="PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA";
+	mScriptBlendMap["blend_one"] = "PSYS_PART_BF_ONE";
+	mScriptBlendMap["blend_zero"] = "PSYS_PART_BF_ZERO";
+	mScriptBlendMap["blend_dest_color"] = "PSYS_PART_BF_DEST_COLOR";
+	mScriptBlendMap["blend_src_color"] = "PSYS_PART_BF_SOURCE_COLOR";
+	mScriptBlendMap["blend_one_minus_dest_color"] = "PSYS_PART_BF_ONE_MINUS_DEST_COLOR";
+	mScriptBlendMap["blend_one_minus_src_color"] = "PSYS_PART_BF_ONE_MINUS_SOURCE_COLOR";
+	mScriptBlendMap["blend_src_alpha"] = "PSYS_PART_BF_SOURCE_ALPHA";
+	mScriptBlendMap["blend_one_minus_src_alpha"] = "PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA";
 
 	// I don't really like referencing the particle texture name here, but it's being done
 	// like this all over the viewer, so this is apparently how it's meant to be. -Zi
-	mDefaultParticleTexture=LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
+	mDefaultParticleTexture = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
 }
 
 ParticleEditor::~ParticleEditor()
@@ -101,117 +101,117 @@ ParticleEditor::~ParticleEditor()
 
 BOOL ParticleEditor::postBuild()
 {
-	LLPanel* panel=getChild<LLPanel>("particle_editor_panel");
+	LLPanel* panel = getChild<LLPanel>("particle_editor_panel");
 
-	mMainPanel=panel;
+	mMainPanel = panel;
 
-	mPatternTypeCombo=panel->getChild<LLComboBox>("pattern_type_combo");
-	mTexturePicker=panel->getChild<LLTextureCtrl>("texture_picker");
+	mPatternTypeCombo = panel->getChild<LLComboBox>("pattern_type_combo");
+	mTexturePicker = panel->getChild<LLTextureCtrl>("texture_picker");
 
-	mBurstRateSpinner=panel->getChild<LLSpinCtrl>("burst_rate_spinner");
-	mBurstCountSpinner=panel->getChild<LLSpinCtrl>("burst_count_spinner");
-	mBurstRadiusSpinner=panel->getChild<LLSpinCtrl>("burst_radius_spinner");
-	mAngleBeginSpinner=panel->getChild<LLSpinCtrl>("angle_begin_spinner");
-	mAngleEndSpinner=panel->getChild<LLSpinCtrl>("angle_end_spinner");
-	mBurstSpeedMinSpinner=panel->getChild<LLSpinCtrl>("burst_speed_min_spinner");
-	mBurstSpeedMaxSpinner=panel->getChild<LLSpinCtrl>("burst_speed_max_spinner");
-	mStartAlphaSpinner=panel->getChild<LLSpinCtrl>("start_alpha_spinner");
-	mEndAlphaSpinner=panel->getChild<LLSpinCtrl>("end_alpha_spinner");
-	mScaleStartXSpinner=panel->getChild<LLSpinCtrl>("scale_start_x_spinner");
-	mScaleStartYSpinner=panel->getChild<LLSpinCtrl>("scale_start_y_spinner");
-	mScaleEndXSpinner=panel->getChild<LLSpinCtrl>("scale_end_x_spinner");
-	mScaleEndYSpinner=panel->getChild<LLSpinCtrl>("scale_end_y_spinner");
-	mSourceMaxAgeSpinner=panel->getChild<LLSpinCtrl>("source_max_age_spinner");
-	mParticlesMaxAgeSpinner=panel->getChild<LLSpinCtrl>("particles_max_age_spinner");
-	mStartGlowSpinner=panel->getChild<LLSpinCtrl>("start_glow_spinner");
-	mEndGlowSpinner=panel->getChild<LLSpinCtrl>("end_glow_spinner");
+	mBurstRateSpinner = panel->getChild<LLSpinCtrl>("burst_rate_spinner");
+	mBurstCountSpinner = panel->getChild<LLSpinCtrl>("burst_count_spinner");
+	mBurstRadiusSpinner = panel->getChild<LLSpinCtrl>("burst_radius_spinner");
+	mAngleBeginSpinner = panel->getChild<LLSpinCtrl>("angle_begin_spinner");
+	mAngleEndSpinner = panel->getChild<LLSpinCtrl>("angle_end_spinner");
+	mBurstSpeedMinSpinner = panel->getChild<LLSpinCtrl>("burst_speed_min_spinner");
+	mBurstSpeedMaxSpinner = panel->getChild<LLSpinCtrl>("burst_speed_max_spinner");
+	mStartAlphaSpinner = panel->getChild<LLSpinCtrl>("start_alpha_spinner");
+	mEndAlphaSpinner = panel->getChild<LLSpinCtrl>("end_alpha_spinner");
+	mScaleStartXSpinner = panel->getChild<LLSpinCtrl>("scale_start_x_spinner");
+	mScaleStartYSpinner = panel->getChild<LLSpinCtrl>("scale_start_y_spinner");
+	mScaleEndXSpinner = panel->getChild<LLSpinCtrl>("scale_end_x_spinner");
+	mScaleEndYSpinner = panel->getChild<LLSpinCtrl>("scale_end_y_spinner");
+	mSourceMaxAgeSpinner = panel->getChild<LLSpinCtrl>("source_max_age_spinner");
+	mParticlesMaxAgeSpinner = panel->getChild<LLSpinCtrl>("particles_max_age_spinner");
+	mStartGlowSpinner = panel->getChild<LLSpinCtrl>("start_glow_spinner");
+	mEndGlowSpinner = panel->getChild<LLSpinCtrl>("end_glow_spinner");
 
-	mBlendFuncSrcCombo=panel->getChild<LLComboBox>("blend_func_src_combo");
-	mBlendFuncDestCombo=panel->getChild<LLComboBox>("blend_func_dest_combo");
+	mBlendFuncSrcCombo = panel->getChild<LLComboBox>("blend_func_src_combo");
+	mBlendFuncDestCombo = panel->getChild<LLComboBox>("blend_func_dest_combo");
 
-	mBounceCheckBox=panel->getChild<LLCheckBoxCtrl>("bounce_checkbox");
-	mEmissiveCheckBox=panel->getChild<LLCheckBoxCtrl>("emissive_checkbox");
-	mFollowSourceCheckBox=panel->getChild<LLCheckBoxCtrl>("follow_source_checkbox");
-	mFollowVelocityCheckBox=panel->getChild<LLCheckBoxCtrl>("follow_velocity_checkbox");
-	mInterpolateColorCheckBox=panel->getChild<LLCheckBoxCtrl>("interpolate_color_checkbox");
-	mInterpolateScaleCheckBox=panel->getChild<LLCheckBoxCtrl>("interpolate_scale_checkbox");
-	mTargetPositionCheckBox=panel->getChild<LLCheckBoxCtrl>("target_position_checkbox");
-	mTargetLinearCheckBox=panel->getChild<LLCheckBoxCtrl>("target_linear_checkbox");
-	mWindCheckBox=panel->getChild<LLCheckBoxCtrl>("wind_checkbox");
-	mRibbonCheckBox=panel->getChild<LLCheckBoxCtrl>("ribbon_checkbox");
+	mBounceCheckBox = panel->getChild<LLCheckBoxCtrl>("bounce_checkbox");
+	mEmissiveCheckBox = panel->getChild<LLCheckBoxCtrl>("emissive_checkbox");
+	mFollowSourceCheckBox = panel->getChild<LLCheckBoxCtrl>("follow_source_checkbox");
+	mFollowVelocityCheckBox = panel->getChild<LLCheckBoxCtrl>("follow_velocity_checkbox");
+	mInterpolateColorCheckBox = panel->getChild<LLCheckBoxCtrl>("interpolate_color_checkbox");
+	mInterpolateScaleCheckBox = panel->getChild<LLCheckBoxCtrl>("interpolate_scale_checkbox");
+	mTargetPositionCheckBox = panel->getChild<LLCheckBoxCtrl>("target_position_checkbox");
+	mTargetLinearCheckBox = panel->getChild<LLCheckBoxCtrl>("target_linear_checkbox");
+	mWindCheckBox = panel->getChild<LLCheckBoxCtrl>("wind_checkbox");
+	mRibbonCheckBox = panel->getChild<LLCheckBoxCtrl>("ribbon_checkbox");
 
-	mTargetKeyInput=panel->getChild<LLLineEditor>("target_key_input");
+	mTargetKeyInput = panel->getChild<LLLineEditor>("target_key_input");
 
-	mAcellerationXSpinner=panel->getChild<LLSpinCtrl>("acceleration_x_spinner");
-	mAcellerationYSpinner=panel->getChild<LLSpinCtrl>("acceleration_y_spinner");
-	mAcellerationZSpinner=panel->getChild<LLSpinCtrl>("acceleration_z_spinner");
+	mAcellerationXSpinner = panel->getChild<LLSpinCtrl>("acceleration_x_spinner");
+	mAcellerationYSpinner = panel->getChild<LLSpinCtrl>("acceleration_y_spinner");
+	mAcellerationZSpinner = panel->getChild<LLSpinCtrl>("acceleration_z_spinner");
 
-	mOmegaXSpinner=panel->getChild<LLSpinCtrl>("omega_x_spinner");
-	mOmegaYSpinner=panel->getChild<LLSpinCtrl>("omega_y_spinner");
-	mOmegaZSpinner=panel->getChild<LLSpinCtrl>("omega_z_spinner");
+	mOmegaXSpinner = panel->getChild<LLSpinCtrl>("omega_x_spinner");
+	mOmegaYSpinner = panel->getChild<LLSpinCtrl>("omega_y_spinner");
+	mOmegaZSpinner = panel->getChild<LLSpinCtrl>("omega_z_spinner");
 
-	mStartColorSelector=panel->getChild<LLColorSwatchCtrl>("start_color_selector");
-	mEndColorSelector=panel->getChild<LLColorSwatchCtrl>("end_color_selector");
+	mStartColorSelector = panel->getChild<LLColorSwatchCtrl>("start_color_selector");
+	mEndColorSelector = panel->getChild<LLColorSwatchCtrl>("end_color_selector");
 
-	mCopyToLSLButton=panel->getChild<LLButton>("copy_button");
-	mCopyToLSLButton->setCommitCallback(boost::bind(&ParticleEditor::onCopyButtonClicked,this));
+	mCopyToLSLButton = panel->getChild<LLButton>("copy_button");
+	mCopyToLSLButton->setCommitCallback(boost::bind(&ParticleEditor::onCopyButtonClicked, this));
 
-	mInjectScriptButton=panel->getChild<LLButton>("inject_button");
-	mInjectScriptButton->setCommitCallback(boost::bind(&ParticleEditor::onInjectButtonClicked,this));
+	mInjectScriptButton = panel->getChild<LLButton>("inject_button");
+	mInjectScriptButton->setCommitCallback(boost::bind(&ParticleEditor::onInjectButtonClicked, this));
 
-	mClearTargetButton=panel->getChild<LLButton>("clear_target_button");
-	mClearTargetButton->setCommitCallback(boost::bind(&ParticleEditor::onClearTargetButtonClicked,this));
+	mClearTargetButton = panel->getChild<LLButton>("clear_target_button");
+	mClearTargetButton->setCommitCallback(boost::bind(&ParticleEditor::onClearTargetButtonClicked, this));
 
-	mPickTargetButton=panel->getChild<LLButton>("pick_target_button");
-	mPickTargetButton->setCommitCallback(boost::bind(&ParticleEditor::onTargetPickerButtonClicked,this));
+	mPickTargetButton = panel->getChild<LLButton>("pick_target_button");
+	mPickTargetButton->setCommitCallback(boost::bind(&ParticleEditor::onTargetPickerButtonClicked, this));
 
-	mPatternTypeCombo->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mTexturePicker->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
+	mPatternTypeCombo->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mTexturePicker->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
 
-	mBurstRateSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mBurstCountSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mBurstRadiusSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mAngleBeginSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mAngleEndSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mBurstSpeedMinSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mBurstSpeedMaxSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mStartAlphaSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mEndAlphaSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mScaleStartXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mScaleStartYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mScaleEndXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mScaleEndYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mSourceMaxAgeSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mParticlesMaxAgeSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mStartGlowSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mEndGlowSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
+	mBurstRateSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mBurstCountSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mBurstRadiusSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mAngleBeginSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mAngleEndSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mBurstSpeedMinSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mBurstSpeedMaxSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mStartAlphaSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mEndAlphaSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mScaleStartXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mScaleStartYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mScaleEndXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mScaleEndYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mSourceMaxAgeSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mParticlesMaxAgeSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mStartGlowSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mEndGlowSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
 
-	mBlendFuncSrcCombo->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mBlendFuncDestCombo->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
+	mBlendFuncSrcCombo->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mBlendFuncDestCombo->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
 
-	mBounceCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mEmissiveCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mFollowSourceCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mFollowVelocityCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mInterpolateColorCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mInterpolateScaleCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mTargetPositionCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mTargetLinearCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mWindCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mRibbonCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
+	mBounceCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mEmissiveCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mFollowSourceCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mFollowVelocityCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mInterpolateColorCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mInterpolateScaleCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mTargetPositionCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mTargetLinearCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mWindCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mRibbonCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
 
-	mTargetKeyInput->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
+	mTargetKeyInput->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
 
-	mAcellerationXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mAcellerationYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mAcellerationZSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
+	mAcellerationXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mAcellerationYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mAcellerationZSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
 
-	mOmegaXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mOmegaYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mOmegaZSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
+	mOmegaXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mOmegaYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mOmegaZSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
 
-	mStartColorSelector->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
-	mEndColorSelector->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
+	mStartColorSelector->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
+	mEndColorSelector->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
 
 	mStartColorSelector->setCanApplyImmediately(TRUE);
 	mEndColorSelector->setCanApplyImmediately(TRUE);
@@ -227,7 +227,7 @@ BOOL ParticleEditor::postBuild()
 
 void ParticleEditor::clearParticles()
 {
-	if(!mObject)
+	if (!mObject)
 		return;
 
 	LL_DEBUGS() << "clearing particles from " << mObject->getID() << LL_ENDL;
@@ -237,11 +237,11 @@ void ParticleEditor::clearParticles()
 
 void ParticleEditor::updateParticles()
 {
-	if(!mObject)
+	if (!mObject)
 		return;
 
 	clearParticles();
-	LLPointer<LLViewerPartSourceScript> pss=LLViewerPartSourceScript::createPSS(mObject,mParticles);
+	LLPointer<LLViewerPartSourceScript> pss = LLViewerPartSourceScript::createPSS(mObject, mParticles);
 
 	pss->setOwnerUUID(mObject->getID());
 	pss->setImage(mTexture);
@@ -251,9 +251,9 @@ void ParticleEditor::updateParticles()
 
 void ParticleEditor::setObject(LLViewerObject* objectp)
 {
-	if(objectp)
+	if (objectp)
 	{
-		mObject=objectp;
+		mObject = objectp;
 
 		LL_DEBUGS() << "adding particles to " << mObject->getID() << LL_ENDL;
 
@@ -263,59 +263,61 @@ void ParticleEditor::setObject(LLViewerObject* objectp)
 
 void ParticleEditor::onParameterChange()
 {
-	mParticles.mPattern=mPatternMap[mPatternTypeCombo->getSelectedValue()];
-	mParticles.mPartImageID=mTexturePicker->getImageAssetID();
+	mParticles.mPattern = mPatternMap[mPatternTypeCombo->getSelectedValue()];
+	mParticles.mPartImageID = mTexturePicker->getImageAssetID();
 
 	// remember the selected texture here to give updateParticles() a UUID to work with
-	mTexture=LLViewerTextureManager::getFetchedTexture(mTexturePicker->getImageAssetID());
+	mTexture = LLViewerTextureManager::getFetchedTexture(mTexturePicker->getImageAssetID());
 
-	if(mTexture->getID()==IMG_DEFAULT || mTexture->getID().isNull())
-		mTexture=mDefaultParticleTexture;
+	if (mTexture->getID() == IMG_DEFAULT || mTexture->getID().isNull())
+	{
+		mTexture = mDefaultParticleTexture;
+	}
 
 	// limit burst rate to 0.01 to avoid internal freeze, script still gets the real value
-	mParticles.mBurstRate=llmax(0.01f,mBurstRateSpinner->getValueF32());
-	mParticles.mBurstPartCount=mBurstCountSpinner->getValue().asInteger();
-	mParticles.mBurstRadius=mBurstRadiusSpinner->getValueF32();
-	mParticles.mInnerAngle=mAngleBeginSpinner->getValueF32();
-	mParticles.mOuterAngle=mAngleEndSpinner->getValueF32();
-	mParticles.mBurstSpeedMin=mBurstSpeedMinSpinner->getValueF32();
-	mParticles.mBurstSpeedMax=mBurstSpeedMaxSpinner->getValueF32();
+	mParticles.mBurstRate = llmax(0.01f, mBurstRateSpinner->getValueF32());
+	mParticles.mBurstPartCount = mBurstCountSpinner->getValue().asInteger();
+	mParticles.mBurstRadius = mBurstRadiusSpinner->getValueF32();
+	mParticles.mInnerAngle = mAngleBeginSpinner->getValueF32();
+	mParticles.mOuterAngle = mAngleEndSpinner->getValueF32();
+	mParticles.mBurstSpeedMin = mBurstSpeedMinSpinner->getValueF32();
+	mParticles.mBurstSpeedMax = mBurstSpeedMaxSpinner->getValueF32();
 	mParticles.mPartData.setStartAlpha(mStartAlphaSpinner->getValueF32());
 	mParticles.mPartData.setEndAlpha(mEndAlphaSpinner->getValueF32());
-	mParticles.mPartData.setStartScale(mScaleStartXSpinner->getValueF32(),mScaleStartYSpinner->getValueF32());
-	mParticles.mPartData.setEndScale(mScaleEndXSpinner->getValueF32(),mScaleEndYSpinner->getValueF32());
-	mParticles.mMaxAge=mSourceMaxAgeSpinner->getValueF32();
+	mParticles.mPartData.setStartScale(mScaleStartXSpinner->getValueF32(), mScaleStartYSpinner->getValueF32());
+	mParticles.mPartData.setEndScale(mScaleEndXSpinner->getValueF32(), mScaleEndYSpinner->getValueF32());
+	mParticles.mMaxAge = mSourceMaxAgeSpinner->getValueF32();
 	mParticles.mPartData.setMaxAge(mParticlesMaxAgeSpinner->getValueF32());
 
 	// different way to set values here, ask Linden Lab why -Zi
-	mParticles.mPartData.mStartGlow=mStartGlowSpinner->getValueF32();
-	mParticles.mPartData.mEndGlow=mEndGlowSpinner->getValueF32();
+	mParticles.mPartData.mStartGlow = mStartGlowSpinner->getValueF32();
+	mParticles.mPartData.mEndGlow = mEndGlowSpinner->getValueF32();
 
-	mParticles.mPartData.mBlendFuncSource=mBlendMap[mBlendFuncSrcCombo->getSelectedValue()];
-	mParticles.mPartData.mBlendFuncDest=mBlendMap[mBlendFuncDestCombo->getSelectedValue()];
+	mParticles.mPartData.mBlendFuncSource = mBlendMap[mBlendFuncSrcCombo->getSelectedValue()];
+	mParticles.mPartData.mBlendFuncDest = mBlendMap[mBlendFuncDestCombo->getSelectedValue()];
 
-	U32 flags=0;
-	if(mBounceCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_BOUNCE_MASK;
-	if(mEmissiveCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_EMISSIVE_MASK;
-	if(mFollowSourceCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_FOLLOW_SRC_MASK;
-	if(mFollowVelocityCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_FOLLOW_VELOCITY_MASK;
-	if(mInterpolateColorCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_INTERP_COLOR_MASK;
-	if(mInterpolateScaleCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_INTERP_SCALE_MASK;
-	if(mTargetPositionCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_TARGET_POS_MASK;
-	if(mTargetLinearCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_TARGET_LINEAR_MASK;
-	if(mWindCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_WIND_MASK;
-	if(mRibbonCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_RIBBON_MASK;
+	U32 flags = 0;
+	if (mBounceCheckBox->getValue().asBoolean())			flags |= LLPartData::LL_PART_BOUNCE_MASK;
+	if (mEmissiveCheckBox->getValue().asBoolean())			flags |= LLPartData::LL_PART_EMISSIVE_MASK;
+	if (mFollowSourceCheckBox->getValue().asBoolean())		flags |= LLPartData::LL_PART_FOLLOW_SRC_MASK;
+	if (mFollowVelocityCheckBox->getValue().asBoolean())	flags |= LLPartData::LL_PART_FOLLOW_VELOCITY_MASK;
+	if (mInterpolateColorCheckBox->getValue().asBoolean())	flags |= LLPartData::LL_PART_INTERP_COLOR_MASK;
+	if (mInterpolateScaleCheckBox->getValue().asBoolean())	flags |= LLPartData::LL_PART_INTERP_SCALE_MASK;
+	if (mTargetPositionCheckBox->getValue().asBoolean())	flags |= LLPartData::LL_PART_TARGET_POS_MASK;
+	if (mTargetLinearCheckBox->getValue().asBoolean())		flags |= LLPartData::LL_PART_TARGET_LINEAR_MASK;
+	if (mWindCheckBox->getValue().asBoolean())				flags |= LLPartData::LL_PART_WIND_MASK;
+	if (mRibbonCheckBox->getValue().asBoolean())			flags |= LLPartData::LL_PART_RIBBON_MASK;
 	mParticles.mPartData.setFlags(flags);
 
-	mParticles.mTargetUUID=mTargetKeyInput->getValue().asUUID();
+	mParticles.mTargetUUID = mTargetKeyInput->getValue().asUUID();
 
-	mParticles.mPartAccel=LLVector3(mAcellerationXSpinner->getValueF32(),mAcellerationYSpinner->getValueF32(),mAcellerationZSpinner->getValueF32());
-	mParticles.mAngularVelocity=LLVector3(mOmegaXSpinner->getValueF32(),mOmegaYSpinner->getValueF32(),mOmegaZSpinner->getValueF32());
+	mParticles.mPartAccel = LLVector3(mAcellerationXSpinner->getValueF32(), mAcellerationYSpinner->getValueF32(), mAcellerationZSpinner->getValueF32());
+	mParticles.mAngularVelocity = LLVector3(mOmegaXSpinner->getValueF32(), mOmegaYSpinner->getValueF32(), mOmegaZSpinner->getValueF32());
 
-	LLColor4 color=mStartColorSelector->get();
-	mParticles.mPartData.setStartColor(LLVector3(color.mV[0],color.mV[1],color.mV[2]));
-	color=mEndColorSelector->get();
-	mParticles.mPartData.setEndColor(LLVector3(color.mV[0],color.mV[1],color.mV[2]));
+	LLColor4 color = mStartColorSelector->get();
+	mParticles.mPartData.setStartColor(LLVector3(color.mV[VX], color.mV[VY], color.mV[VZ]));
+	color = mEndColorSelector->get();
+	mParticles.mPartData.setEndColor(LLVector3(color.mV[VX], color.mV[VY], color.mV[VZ]));
 
 	updateUI();
 	updateParticles();
@@ -323,20 +325,20 @@ void ParticleEditor::onParameterChange()
 
 void ParticleEditor::updateUI()
 {
-	U8 pattern=mPatternMap[mPatternTypeCombo->getValue()];
-	BOOL dropPattern=(pattern==LLPartSysData::LL_PART_SRC_PATTERN_DROP);
-	BOOL explodePattern=(pattern==LLPartSysData::LL_PART_SRC_PATTERN_EXPLODE);
-	BOOL targetLinear=mTargetLinearCheckBox->getValue();
-	BOOL interpolateColor=mInterpolateColorCheckBox->getValue();
-	BOOL interpolateScale=mInterpolateScaleCheckBox->getValue();
-	BOOL targetEnabled=targetLinear | (mTargetPositionCheckBox->getValue().asBoolean() ? TRUE : FALSE);
+	U8 pattern = mPatternMap[mPatternTypeCombo->getValue()];
+	BOOL dropPattern = (pattern == LLPartSysData::LL_PART_SRC_PATTERN_DROP);
+	BOOL explodePattern = (pattern == LLPartSysData::LL_PART_SRC_PATTERN_EXPLODE);
+	BOOL targetLinear = mTargetLinearCheckBox->getValue();
+	BOOL interpolateColor = mInterpolateColorCheckBox->getValue();
+	BOOL interpolateScale = mInterpolateScaleCheckBox->getValue();
+	BOOL targetEnabled = targetLinear | (mTargetPositionCheckBox->getValue().asBoolean() ? TRUE : FALSE);
 
 	mBurstRadiusSpinner->setEnabled(!(targetLinear | (mFollowSourceCheckBox->getValue().asBoolean() ? TRUE : FALSE) | dropPattern));
 	mBurstSpeedMinSpinner->setEnabled(!(targetLinear | dropPattern));
 	mBurstSpeedMaxSpinner->setEnabled(!(targetLinear | dropPattern));
 
 	// disabling a color swatch does nothing visually, so we also set alpha
-	LLColor4 endColor=mEndColorSelector->get();
+	LLColor4 endColor = mEndColorSelector->get();
 	endColor.setAlpha(interpolateColor ? 1.0f : 0.0f);
 
 	mEndAlphaSpinner->setEnabled(interpolateColor);
@@ -380,38 +382,38 @@ void ParticleEditor::onTargetPickerButtonClicked()
 // static
 void ParticleEditor::startPicking(void* userdata)
 {
-	ParticleEditor* self =(ParticleEditor*) userdata;
-	LLToolObjPicker::getInstance()->setExitCallback(ParticleEditor::onTargetPicked,self);
+	ParticleEditor* self = (ParticleEditor*) userdata;
+	LLToolObjPicker::getInstance()->setExitCallback(ParticleEditor::onTargetPicked, self);
 	LLToolMgr::getInstance()->setTransientTool(LLToolObjPicker::getInstance());
 }
 
 // static
 void ParticleEditor::onTargetPicked(void* userdata)
 {
-	ParticleEditor* self=(ParticleEditor*) userdata;
+	ParticleEditor* self = (ParticleEditor*)userdata;
 
-	LLUUID picked=LLToolObjPicker::getInstance()->getObjectID();
+	LLUUID picked = LLToolObjPicker::getInstance()->getObjectID();
 
 	LLToolMgr::getInstance()->clearTransientTool();
 
 	self->mPickTargetButton->setEnabled(TRUE);
 	self->mPickTargetButton->setToggleState(FALSE);
 
-	if(picked.notNull())
+	if (picked.notNull())
 	{
 		self->mTargetKeyInput->setValue(picked.asString());
 		self->onParameterChange();
 	}
 }
 
-std::string ParticleEditor::lslVector(F32 x,F32 y,F32 z)
+std::string ParticleEditor::lslVector(F32 x, F32 y, F32 z)
 {
-	return llformat("<%f,%f,%f>",x,y,z);
+	return llformat("<%f,%f,%f>", x, y, z);
 }
 
 std::string ParticleEditor::lslColor(const LLColor4& color)
 {
-	return lslVector(color.mV[0],color.mV[1],color.mV[2]);
+	return lslVector(color.mV[VX], color.mV[VY], color.mV[VZ]);
 }
 
 std::string ParticleEditor::createScript()
@@ -454,67 +456,71 @@ default\n\
     }\n\
 }\n";
 
-	LLUUID targetKey=mTargetKeyInput->getValue().asUUID();
-	std::string keyString="llGetKey()";
+	LLUUID targetKey = mTargetKeyInput->getValue().asUUID();
+	std::string keyString = "llGetKey()";
 
-	if(!targetKey.isNull() && targetKey!=mObject->getID())
-		keyString="(key) \""+targetKey.asString()+"\"";
+	if (targetKey.notNull() && targetKey != mObject->getID())
+	{
+		keyString="(key) \"" + targetKey.asString() + "\"";
+	}
 
-	LLUUID textureKey=mTexture->getID();
+	LLUUID textureKey = mTexture->getID();
 	std::string textureString;
-	if(!textureKey.isNull() && textureKey!=IMG_DEFAULT && textureKey!=mDefaultParticleTexture->getID())
-		textureString=textureKey.asString();
+	if (textureKey.notNull() && textureKey != IMG_DEFAULT && textureKey != mDefaultParticleTexture->getID())
+	{
+		textureString = textureKey.asString();
+	}
 
-	LLStringUtil::replaceString(script,"[PATTERN]",mScriptPatternMap[mPatternTypeCombo->getValue()]);
-	LLStringUtil::replaceString(script,"[BURST_RADIUS]",mBurstRadiusSpinner->getValue().asString());
-	LLStringUtil::replaceString(script,"[ANGLE_BEGIN]",mAngleBeginSpinner->getValue().asString());
-	LLStringUtil::replaceString(script,"[ANGLE_END]",mAngleEndSpinner->getValue().asString());
-	LLStringUtil::replaceString(script,"[TARGET_KEY]",keyString);
-	LLStringUtil::replaceString(script,"[START_COLOR]",lslColor(mStartColorSelector->get()));
-	LLStringUtil::replaceString(script,"[END_COLOR]",lslColor(mEndColorSelector->get()));
-	LLStringUtil::replaceString(script,"[START_ALPHA]",mStartAlphaSpinner->getValue().asString());
-	LLStringUtil::replaceString(script,"[END_ALPHA]",mEndAlphaSpinner->getValue().asString());
-	LLStringUtil::replaceString(script,"[START_GLOW]",mStartGlowSpinner->getValue().asString());
-	LLStringUtil::replaceString(script,"[END_GLOW]",mEndGlowSpinner->getValue().asString());
-	LLStringUtil::replaceString(script,"[START_SCALE]",lslVector(mScaleStartXSpinner->getValueF32(),mScaleStartYSpinner->getValueF32(),0.0f));
-	LLStringUtil::replaceString(script,"[END_SCALE]",lslVector(mScaleEndXSpinner->getValueF32(),mScaleEndYSpinner->getValueF32(),0.0f));
-	LLStringUtil::replaceString(script,"[TEXTURE]",textureString);
-	LLStringUtil::replaceString(script,"[SOURCE_MAX_AGE]",mSourceMaxAgeSpinner->getValue().asString());
-	LLStringUtil::replaceString(script,"[PART_MAX_AGE]",mParticlesMaxAgeSpinner->getValue().asString());
-	LLStringUtil::replaceString(script,"[BURST_RATE]",mBurstRateSpinner->getValue().asString());
-	LLStringUtil::replaceString(script,"[BURST_COUNT]",mBurstCountSpinner->getValue());
-	LLStringUtil::replaceString(script,"[ACCELERATION]",lslVector(mAcellerationXSpinner->getValueF32(),mAcellerationYSpinner->getValueF32(),mAcellerationZSpinner->getValueF32()));
-	LLStringUtil::replaceString(script,"[OMEGA]",lslVector(mOmegaXSpinner->getValueF32(),mOmegaYSpinner->getValueF32(),mOmegaZSpinner->getValueF32()));
-	LLStringUtil::replaceString(script,"[BURST_SPEED_MIN]",mBurstSpeedMinSpinner->getValue().asString());
-	LLStringUtil::replaceString(script,"[BURST_SPEED_MAX]",mBurstSpeedMaxSpinner->getValue().asString());
-	LLStringUtil::replaceString(script,"[BLEND_FUNC_SOURCE]",mScriptBlendMap[mBlendFuncSrcCombo->getValue().asString()]);
-	LLStringUtil::replaceString(script,"[BLEND_FUNC_DEST]",mScriptBlendMap[mBlendFuncDestCombo->getValue().asString()]);
+	LLStringUtil::replaceString(script,"[PATTERN]", mScriptPatternMap[mPatternTypeCombo->getValue()]);
+	LLStringUtil::replaceString(script,"[BURST_RADIUS]", mBurstRadiusSpinner->getValue().asString());
+	LLStringUtil::replaceString(script,"[ANGLE_BEGIN]", mAngleBeginSpinner->getValue().asString());
+	LLStringUtil::replaceString(script,"[ANGLE_END]", mAngleEndSpinner->getValue().asString());
+	LLStringUtil::replaceString(script,"[TARGET_KEY]", keyString);
+	LLStringUtil::replaceString(script,"[START_COLOR]", lslColor(mStartColorSelector->get()));
+	LLStringUtil::replaceString(script,"[END_COLOR]", lslColor(mEndColorSelector->get()));
+	LLStringUtil::replaceString(script,"[START_ALPHA]", mStartAlphaSpinner->getValue().asString());
+	LLStringUtil::replaceString(script,"[END_ALPHA]", mEndAlphaSpinner->getValue().asString());
+	LLStringUtil::replaceString(script,"[START_GLOW]", mStartGlowSpinner->getValue().asString());
+	LLStringUtil::replaceString(script,"[END_GLOW]", mEndGlowSpinner->getValue().asString());
+	LLStringUtil::replaceString(script,"[START_SCALE]", lslVector(mScaleStartXSpinner->getValueF32(), mScaleStartYSpinner->getValueF32(), 0.0f));
+	LLStringUtil::replaceString(script,"[END_SCALE]", lslVector(mScaleEndXSpinner->getValueF32(), mScaleEndYSpinner->getValueF32(), 0.0f));
+	LLStringUtil::replaceString(script,"[TEXTURE]", textureString);
+	LLStringUtil::replaceString(script,"[SOURCE_MAX_AGE]", mSourceMaxAgeSpinner->getValue().asString());
+	LLStringUtil::replaceString(script,"[PART_MAX_AGE]", mParticlesMaxAgeSpinner->getValue().asString());
+	LLStringUtil::replaceString(script,"[BURST_RATE]", mBurstRateSpinner->getValue().asString());
+	LLStringUtil::replaceString(script,"[BURST_COUNT]", mBurstCountSpinner->getValue());
+	LLStringUtil::replaceString(script,"[ACCELERATION]", lslVector(mAcellerationXSpinner->getValueF32(), mAcellerationYSpinner->getValueF32(), mAcellerationZSpinner->getValueF32()));
+	LLStringUtil::replaceString(script,"[OMEGA]", lslVector(mOmegaXSpinner->getValueF32(), mOmegaYSpinner->getValueF32(), mOmegaZSpinner->getValueF32()));
+	LLStringUtil::replaceString(script,"[BURST_SPEED_MIN]", mBurstSpeedMinSpinner->getValue().asString());
+	LLStringUtil::replaceString(script,"[BURST_SPEED_MAX]", mBurstSpeedMaxSpinner->getValue().asString());
+	LLStringUtil::replaceString(script,"[BLEND_FUNC_SOURCE]", mScriptBlendMap[mBlendFuncSrcCombo->getValue().asString()]);
+	LLStringUtil::replaceString(script,"[BLEND_FUNC_DEST]", mScriptBlendMap[mBlendFuncDestCombo->getValue().asString()]);
 
-	std::string delimiter=" |\n                ";
+	std::string delimiter = " |\n                ";
 	std::string flagsString;
 
-	if(mBounceCheckBox->getValue())
-		flagsString+=delimiter+"PSYS_PART_BOUNCE_MASK";
-	if(mEmissiveCheckBox->getValue())
-		flagsString+=delimiter+"PSYS_PART_EMISSIVE_MASK";
-	if(mFollowSourceCheckBox->getValue())
-		flagsString+=delimiter+"PSYS_PART_FOLLOW_SRC_MASK";
-	if(mFollowVelocityCheckBox->getValue())
-		flagsString+=delimiter+"PSYS_PART_FOLLOW_VELOCITY_MASK";
-	if(mInterpolateColorCheckBox->getValue())
-		flagsString+=delimiter+"PSYS_PART_INTERP_COLOR_MASK";
-	if(mInterpolateScaleCheckBox->getValue())
-		flagsString+=delimiter+"PSYS_PART_INTERP_SCALE_MASK";
-	if(mTargetLinearCheckBox->getValue())
-		flagsString+=delimiter+"PSYS_PART_TARGET_LINEAR_MASK";
-	if(mTargetPositionCheckBox->getValue())
-		flagsString+=delimiter+"PSYS_PART_TARGET_POS_MASK";
-	if(mWindCheckBox->getValue())
-		flagsString+=delimiter+"PSYS_PART_WIND_MASK";
-	if(mRibbonCheckBox->getValue())
-		flagsString+=delimiter+"PSYS_PART_RIBBON_MASK";
+	if (mBounceCheckBox->getValue())
+		flagsString += delimiter + "PSYS_PART_BOUNCE_MASK";
+	if (mEmissiveCheckBox->getValue())
+		flagsString += delimiter + "PSYS_PART_EMISSIVE_MASK";
+	if (mFollowSourceCheckBox->getValue())
+		flagsString += delimiter + "PSYS_PART_FOLLOW_SRC_MASK";
+	if (mFollowVelocityCheckBox->getValue())
+		flagsString += delimiter + "PSYS_PART_FOLLOW_VELOCITY_MASK";
+	if (mInterpolateColorCheckBox->getValue())
+		flagsString += delimiter + "PSYS_PART_INTERP_COLOR_MASK";
+	if (mInterpolateScaleCheckBox->getValue())
+		flagsString += delimiter + "PSYS_PART_INTERP_SCALE_MASK";
+	if (mTargetLinearCheckBox->getValue())
+		flagsString += delimiter + "PSYS_PART_TARGET_LINEAR_MASK";
+	if (mTargetPositionCheckBox->getValue())
+		flagsString += delimiter + "PSYS_PART_TARGET_POS_MASK";
+	if (mWindCheckBox->getValue())
+		flagsString += delimiter + "PSYS_PART_WIND_MASK";
+	if (mRibbonCheckBox->getValue())
+		flagsString += delimiter + "PSYS_PART_RIBBON_MASK";
 
-	LLStringUtil::replaceString(script,"[FLAGS]",flagsString);
+	LLStringUtil::replaceString(script, "[FLAGS]", flagsString);
 	LL_DEBUGS() << "\n" << script << LL_ENDL;
 
 	return script;
@@ -522,8 +528,8 @@ default\n\
 
 void ParticleEditor::onCopyButtonClicked()
 {
-	std::string script=createScript();
-	if(!script.empty())
+	std::string script = createScript();
+	if (!script.empty())
 	{
 		getWindow()->copyTextToClipboard(utf8str_to_wstring(script));
 		LLNotificationsUtil::add("ParticleScriptCopiedToClipboard");
@@ -536,21 +542,23 @@ void ParticleEditor::onInjectButtonClicked()
 	LLUUID categoryID;
 
 	// first try to find the #Firestorm folder
-	categoryID=gInventory.findCategoryByName(ROOT_FIRESTORM_FOLDER);
+	categoryID = gInventory.findCategoryByName(ROOT_FIRESTORM_FOLDER);
 
 	// if no #Firestorm folder was found, create one
-	if(categoryID.isNull())
-		categoryID=gInventory.createNewCategory(gInventory.getRootFolderID(),LLFolderType::FT_NONE,ROOT_FIRESTORM_FOLDER);
+	if (categoryID.isNull())
+	{
+		categoryID = gInventory.createNewCategory(gInventory.getRootFolderID(), LLFolderType::FT_NONE, ROOT_FIRESTORM_FOLDER);
+	}
 
 	// if still no #Firestorm folder was found, try to find the default "Scripts" folder
-	if(categoryID.isNull())
+	if (categoryID.isNull())
 	{
-		std::string scriptFolderName=LLFolderType::lookup(LLFolderType::FT_LSL_TEXT);
+		std::string scriptFolderName = LLFolderType::lookup(LLFolderType::FT_LSL_TEXT);
 		gInventory.findCategoryByName(scriptFolderName);
 	}
 
 	// if still no valid folder found bail out and complain
-	if(categoryID.isNull())
+	if (categoryID.isNull())
 	{
 		LLNotificationsUtil::add("ParticleScriptFindFolderFailed");
 		return;
@@ -558,21 +566,21 @@ void ParticleEditor::onInjectButtonClicked()
 
 	// setup permissions
 	LLPermissions perm;
-	perm.init(gAgent.getID(),gAgent.getID(),LLUUID::null,LLUUID::null);
-	perm.initMasks(PERM_ALL,PERM_ALL,PERM_ALL,PERM_ALL,PERM_ALL);
+	perm.init(gAgentID, gAgentID, LLUUID::null, LLUUID::null);
+	perm.initMasks(PERM_ALL, PERM_ALL, PERM_ALL, PERM_ALL, PERM_ALL);
 
 	// create new script inventory item and wait for it to come back (callback)
-	LLPointer<LLInventoryCallback> callback=new ParticleScriptCreationCallback(this);
+	LLPointer<LLInventoryCallback> callback = new ParticleScriptCreationCallback(this);
 	create_inventory_item(
-		gAgent.getID(), 
-		gAgent.getSessionID(),
+		gAgentID,
+		gAgentSessionID,
 		categoryID,
-		LLTransactionID::tnull, 
-		PARTICLE_SCRIPT_NAME, 
-		"", 
-		LLAssetType::AT_LSL_TEXT, 
+		LLTransactionID::tnull,
+		PARTICLE_SCRIPT_NAME,
+		"",
+		LLAssetType::AT_LSL_TEXT,
 		LLInventoryType::IT_LSL,
-		NOT_WEARABLE, 
+		NOT_WEARABLE,
 		perm.getMaskNextOwner(),
 		callback);
 
@@ -583,34 +591,34 @@ void ParticleEditor::callbackReturned(const LLUUID& inventoryItemID)
 {
 	setCanClose(TRUE);
 
-	if(inventoryItemID.isNull())
+	if (inventoryItemID.isNull())
 	{
 		LLNotificationsUtil::add("ParticleScriptCreationFailed");
 		return;
 	}
 
-	mParticleScriptInventoryItem=gInventory.getItem(inventoryItemID);
-	if(!mParticleScriptInventoryItem) 
+	mParticleScriptInventoryItem = gInventory.getItem(inventoryItemID);
+	if (!mParticleScriptInventoryItem) 
 	{
 		LLNotificationsUtil::add("ParticleScriptNotFound");
 		return;
 	}
-    gInventory.updateItem(mParticleScriptInventoryItem);
-    gInventory.notifyObservers();
+	gInventory.updateItem(mParticleScriptInventoryItem);
+	gInventory.notifyObservers();
 
 	//caps import 
-	std::string url=gAgent.getRegion()->getCapability("UpdateScriptAgent");
+	std::string url = gAgent.getRegion()->getCapability("UpdateScriptAgent");
 
-	if(!url.empty())  
+	if (!url.empty())
 	{
-		std::string script=createScript();
+		std::string script = createScript();
 
-		std::string tempFileName=gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"particle_script.lsltxt");
+		std::string tempFileName = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "particle_script.lsltxt");
 
 		std::ofstream tempFile;
 
 		tempFile.open(tempFileName.c_str());
-		if(!tempFile.is_open())
+		if (!tempFile.is_open())
 		{
 			LLNotificationsUtil::add("ParticleScriptCreateTempFileFailed");
 			return;
@@ -620,13 +628,13 @@ void ParticleEditor::callbackReturned(const LLUUID& inventoryItemID)
 		tempFile.close();
 
 		LLSD body;
-		body["task_id"]=mObject->getID();	// probably has no effect
-		body["item_id"]=inventoryItemID;
-		body["target"]="mono";
-		body["is_script_running"]=true;
+		body["task_id"] = mObject->getID();	// probably has no effect
+		body["item_id"] = inventoryItemID;
+		body["target"] = "mono";
+		body["is_script_running"] = true;
 
 		// responder will alert us when the job is done
-		LLHTTPClient::post(url,body,new ParticleScriptUploadResponder(body,tempFileName,LLAssetType::AT_LSL_TEXT,this));
+		LLHTTPClient::post(url, body, new ParticleScriptUploadResponder(body, tempFileName, LLAssetType::AT_LSL_TEXT, this));
 
 		mMainPanel->setEnabled(FALSE);
 		setCanClose(FALSE);
@@ -643,15 +651,15 @@ void ParticleEditor::scriptInjectReturned(const LLSD& content)
 	setCanClose(TRUE);
 
 	// play it safe, because some time may have passed
-	LLViewerObject* object=gObjectList.findObject(mObject->getID());
-	if(!object)
+	LLViewerObject* object = gObjectList.findObject(mObject->getID());
+	if (!object)
 	{
 		LL_DEBUGS() << "object went away!" << LL_ENDL;
 		mMainPanel->setEnabled(TRUE);
 		return;
 	}
 
-	mObject->saveScript(mParticleScriptInventoryItem,TRUE,FALSE);
+	mObject->saveScript(mParticleScriptInventoryItem, TRUE, FALSE);
 	LLNotificationsUtil::add("ParticleScriptInjected");
 
 	delete this;
@@ -661,7 +669,7 @@ void ParticleEditor::scriptInjectReturned(const LLSD& content)
 
 ParticleScriptCreationCallback::ParticleScriptCreationCallback(ParticleEditor* editor)
 {
-	mEditor=editor;
+	mEditor = editor;
 }
 
 ParticleScriptCreationCallback::~ParticleScriptCreationCallback()
@@ -680,9 +688,9 @@ ParticleScriptUploadResponder::ParticleScriptUploadResponder(const LLSD& post_da
 															 LLAssetType::EType asset_type,
 															 ParticleEditor* editor
 															) :
-	LLUpdateAgentInventoryResponder(post_data,file_name,asset_type)
+	LLUpdateAgentInventoryResponder(post_data, file_name, asset_type)
 {
-	mEditor=editor;
+	mEditor = editor;
 }
 
 void ParticleScriptUploadResponder::uploadComplete(const LLSD& content)
diff --git a/indra/newview/particleeditor.h b/indra/newview/particleeditor.h
index 4232adb3bb..befb2618ca 100644
--- a/indra/newview/particleeditor.h
+++ b/indra/newview/particleeditor.h
@@ -72,7 +72,7 @@ class ParticleEditor : public LLFloater
 		void callbackReturned(const LLUUID& inv_item);
 		void scriptInjectReturned(const LLSD& content);
 
-		std::string lslVector(F32 x,F32 y,F32 z);
+		std::string lslVector(F32 x, F32 y, F32 z);
 		std::string lslColor(const LLColor4& color);
 
 		LLViewerObject* mObject;
@@ -83,11 +83,11 @@ class ParticleEditor : public LLFloater
 
 		LLPartSysData mParticles;
 
-		std::map<std::string,U8> mPatternMap;
-		std::map<std::string,std::string> mScriptPatternMap;
+		std::map<std::string, U8> mPatternMap;
+		std::map<std::string, std::string> mScriptPatternMap;
 
-		std::map<std::string,U8> mBlendMap;
-		std::map<std::string,std::string> mScriptBlendMap;
+		std::map<std::string, U8> mBlendMap;
+		std::map<std::string, std::string> mScriptBlendMap;
 
 		LLPanel* mMainPanel;
 
diff --git a/indra/newview/sanitycheck.cpp b/indra/newview/sanitycheck.cpp
index d376a8d0f7..422e5c9e44 100644
--- a/indra/newview/sanitycheck.cpp
+++ b/indra/newview/sanitycheck.cpp
@@ -44,9 +44,9 @@ void SanityCheck::init()
 		f(SanityCheck* s) : chk(s) {};
 		virtual void apply(const std::string& name, LLControlVariable* control)
 		{
-			if(control->getSanityType()!=SANITY_TYPE_NONE)
+			if (control->getSanityType() != SANITY_TYPE_NONE)
 			{
-				control->getSanitySignal()->connect(boost::bind(&SanityCheck::onSanity,_1));
+				control->getSanitySignal()->connect(boost::bind(&SanityCheck::onSanity, _1));
 				SanityCheck::instance().onSanity(control);
 			}
 		}
@@ -59,26 +59,26 @@ void SanityCheck::init()
 // static
 void SanityCheck::onSanity(LLControlVariable* controlp)
 {
-	static LLControlVariable* lastControl=NULL;
+	static LLControlVariable* lastControl = NULL;
 
-	if(controlp->isSane())
+	if (controlp->isSane())
 		return;
 
-	if(controlp==lastControl)
+	if (controlp == lastControl)
 		return;
 
-	lastControl=controlp;
+	lastControl = controlp;
 
-	std::string checkType="SanityCheck"+gSavedSettings.sanityTypeEnumToString(controlp->getSanityType());
-	std::vector<LLSD> sanityValues=controlp->getSanityValues();
+	std::string checkType = "SanityCheck" + gSavedSettings.sanityTypeEnumToString(controlp->getSanityType());
+	std::vector<LLSD> sanityValues = controlp->getSanityValues();
 
 	LLSD args;
 	LLStringUtil::format_map_t map;
-	map["VALUE_1"]=sanityValues[0].asString();
-	map["VALUE_2"]=sanityValues[1].asString();
-	map["CONTROL_NAME"]=controlp->getName();
-	args["SANITY_MESSAGE"]=LLTrans::getString(checkType,map);
-	args["SANITY_COMMENT"]=controlp->getSanityComment();
-	args["CURRENT_VALUE"]=controlp->getValue().asString();
-	LLNotificationsUtil::add("SanityCheck",args);
+	map["VALUE_1"] = sanityValues[0].asString();
+	map["VALUE_2"] = sanityValues[1].asString();
+	map["CONTROL_NAME"] = controlp->getName();
+	args["SANITY_MESSAGE"] = LLTrans::getString(checkType,map);
+	args["SANITY_COMMENT"] = controlp->getSanityComment();
+	args["CURRENT_VALUE"] = controlp->getValue().asString();
+	LLNotificationsUtil::add("SanityCheck", args);
 }

From a30090071cda710013b7738e6896c9c49236d5e2 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 5 Jan 2015 15:14:02 +0100
Subject: [PATCH 215/229] FIRE-11745 / MAINT-3178: Fix particles using textures
 containing alpha flash white at certain camera angles by partially undoing
 6317cce88ffc (particle index accounting); Found by Shyotl Kuhr (Singularity
 viewer)

---
 indra/newview/llviewerpartsim.cpp |  3 +-
 indra/newview/llvopartgroup.cpp   | 61 ++++++++++++++++++++++++++++---
 indra/newview/llvopartgroup.h     |  6 ++-
 3 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
index f7eb7df46c..caf25ce660 100755
--- a/indra/newview/llviewerpartsim.cpp
+++ b/indra/newview/llviewerpartsim.cpp
@@ -664,7 +664,8 @@ void LLViewerPartSim::updateSimulation()
 	static LLFrameTimer update_timer;
 
 	//reset VBO cursor
-	LLVOPartGroup::sVBSlotCursor = 0;
+	// <FS> Fix particle flashing
+	//LLVOPartGroup::sVBSlotCursor = 0;
 
 	const F32 dt = llmin(update_timer.getElapsedTimeAndResetF32(), 0.1f);
 
diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp
index f90d827827..f54cb639cd 100755
--- a/indra/newview/llvopartgroup.cpp
+++ b/indra/newview/llvopartgroup.cpp
@@ -49,11 +49,22 @@ const F32 MAX_PART_LIFETIME = 120.f;
 extern U64MicrosecondsImplicit gFrameTime;
 
 LLPointer<LLVertexBuffer> LLVOPartGroup::sVB = NULL;
-S32 LLVOPartGroup::sVBSlotCursor = 0;
+// <FS> Fix particle flashing
+//S32 LLVOPartGroup::sVBSlotCursor = 0;
+S32 LLVOPartGroup::sVBSlotFree[];
+S32* LLVOPartGroup::sVBSlotCursor = NULL;
+// </FS>
 
 void LLVOPartGroup::initClass()
 {
-	
+	// <FS> Fix particle flashing
+	for (S32 i = 0; i < LL_MAX_PARTICLE_COUNT; ++i)
+	{
+		sVBSlotFree[i] = i;
+	}
+
+	sVBSlotCursor = sVBSlotFree;
+	// </FS>
 }
 
 //static
@@ -118,12 +129,21 @@ void LLVOPartGroup::destroyGL()
 //static
 S32 LLVOPartGroup::findAvailableVBSlot()
 {
-	if (sVBSlotCursor >= LL_MAX_PARTICLE_COUNT)
+	// <FS> Fix particle flashing
+	//if (sVBSlotCursor >= LL_MAX_PARTICLE_COUNT)
+	if (sVBSlotCursor >= sVBSlotFree + LL_MAX_PARTICLE_COUNT)
+	// </FS>
 	{ //no more available slots
 		return -1;
 	}
 
-	return sVBSlotCursor++;
+	// <FS> Fix particle flashing
+	//return sVBSlotCursor++;
+	S32 ret = *sVBSlotCursor;
+	sVBSlotCursor++;
+
+	return ret;
+	// </FS>
 }
 
 bool ll_is_part_idx_allocated(S32 idx, S32* start, S32* end)
@@ -138,12 +158,27 @@ bool ll_is_part_idx_allocated(S32 idx, S32* start, S32* end)
 	}*/
 
 	//allocated (not in free list)
-	return false;
+	// <FS> Fix particle flashing
+	//return false;
+
+	while (start < end)
+	{
+		if (*start == idx)
+		{ //not allocated (in free list)
+			return false;
+		}
+		++start;
+	}
+
+	//allocated (not in free list)
+	return true;
+	// </FS>
 }
 
 //static
 void LLVOPartGroup::freeVBSlot(S32 idx)
 {
+	// <FS> Fix particle flashing
 	/*llassert(idx < LL_MAX_PARTICLE_COUNT && idx >= 0);
 	//llassert(sVBSlotCursor > sVBSlotFree);
 	//llassert(ll_is_part_idx_allocated(idx, sVBSlotCursor, sVBSlotFree+LL_MAX_PARTICLE_COUNT));
@@ -153,6 +188,16 @@ void LLVOPartGroup::freeVBSlot(S32 idx)
 		sVBSlotCursor--;
 		*sVBSlotCursor = idx;
 	}*/
+	llassert(idx < LL_MAX_PARTICLE_COUNT && idx >= 0);
+	//llassert(sVBSlotCursor > sVBSlotFree);
+	//llassert(ll_is_part_idx_allocated(idx, sVBSlotCursor, sVBSlotFree+LL_MAX_PARTICLE_COUNT));
+
+	if (sVBSlotCursor > sVBSlotFree)
+	{
+		sVBSlotCursor--;
+		*sVBSlotCursor = idx;
+	}
+	// </FS>
 }
 
 LLVOPartGroup::LLVOPartGroup(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
@@ -864,7 +909,10 @@ void LLParticlePartition::getGeometry(LLSpatialGroup* group)
 		LLFace* facep = *i;
 		LLAlphaObject* object = (LLAlphaObject*) facep->getViewerObject();
 
+		// <FS> Fix particle flashing
 		//if (!facep->isState(LLFace::PARTICLE))
+		if (!facep->isState(LLFace::PARTICLE))
+		// </FS>
 		{ //set the indices of this face
 			S32 idx = LLVOPartGroup::findAvailableVBSlot();
 			if (idx >= 0)
@@ -873,7 +921,10 @@ void LLParticlePartition::getGeometry(LLSpatialGroup* group)
 				facep->setIndicesIndex(idx*6);
 				facep->setVertexBuffer(LLVOPartGroup::sVB);
 				facep->setPoolType(LLDrawPool::POOL_ALPHA);
+				// <FS> Fix particle flashing
 				//facep->setState(LLFace::PARTICLE);
+				facep->setState(LLFace::PARTICLE);
+				// </FS>
 			}
 			else
 			{
diff --git a/indra/newview/llvopartgroup.h b/indra/newview/llvopartgroup.h
index 2ef8b1c848..0b14d2ff48 100755
--- a/indra/newview/llvopartgroup.h
+++ b/indra/newview/llvopartgroup.h
@@ -42,7 +42,11 @@ public:
 
 	//vertex buffer for holding all particles
 	static LLPointer<LLVertexBuffer> sVB;
-	static S32 sVBSlotCursor;
+	// <FS> Fix particle flashing
+	//static S32 sVBSlotCursor;
+	static S32 sVBSlotFree[LL_MAX_PARTICLE_COUNT];
+	static S32* sVBSlotCursor;
+	// </FS>
 
 	static void initClass();
 	static void restoreGL();

From 2c6af0629c5563117d5a11f16f2e9b5bace05b90 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 6 Jan 2015 10:04:52 +0100
Subject: [PATCH 216/229] FIRE-15334: Pressing <Return> in chat bar when text
 is selected can result in text being deleted before send

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

diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp
index 698f3d5e3f..0a4e4dda98 100755
--- a/indra/llui/llchatentry.cpp
+++ b/indra/llui/llchatentry.cpp
@@ -190,8 +190,11 @@ BOOL LLChatEntry::handleSpecialKey(const KEY key, const MASK mask)
     if (key == KEY_RETURN)
     {
         endOfDoc();
-        startSelection();
-        endSelection();
+		// <FS:Ansariel> FIRE-15334: Properly deselect
+        //startSelection();
+        //endSelection();
+		deselect();
+		// </FS:Ansariel>
     }
 
 	LLTextEditor::handleSpecialKey(key, mask);

From fd76ff405d0caac0a4c401692212ff64ab11aadb Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 6 Jan 2015 15:22:32 +0100
Subject: [PATCH 217/229] Don't need this here...

---
 indra/newview/llviewermessage.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 6f930740a3..63c212980d 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1213,7 +1213,7 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
 		static LLCachedControl<U32> fsOfferThrottleMaxCount(gSavedSettings, "FSOfferThrottleMaxCount");
 		if (LLStartUp::getStartupState() >= STATE_STARTED
 			//&& throttle_count >= OFFER_THROTTLE_MAX_COUNT)
-			&& throttle_count >= U32(fsOfferThrottleMaxCount))
+			&& throttle_count >= fsOfferThrottleMaxCount)
 		{
 			if (!throttle_logged)
 			{
@@ -1232,7 +1232,6 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
 				if (!from_name.empty())
 				{
 					// <FS:PP> gSavedSettings to LLCachedControl
-					// if (gSavedSettings.getBOOL("FSNotifyIncomingObjectSpamFrom"))
 					static LLCachedControl<bool> fsNotifyIncomingObjectSpamFrom(gSavedSettings, "FSNotifyIncomingObjectSpamFrom");
 					if (fsNotifyIncomingObjectSpamFrom)
 					// </FS:PP>
@@ -1244,7 +1243,6 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
 				else
 				{
 					// <FS:PP> gSavedSettings to LLCachedControl
-					// if (gSavedSettings.getBOOL("FSNotifyIncomingObjectSpam"))
 					static LLCachedControl<bool> fsNotifyIncomingObjectSpam(gSavedSettings, "FSNotifyIncomingObjectSpam");
 					if (fsNotifyIncomingObjectSpam)
 					// </FS:PP>

From 8335dcb097d204060c6eef1c2d81b6a7e27da056 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 6 Jan 2015 16:57:12 +0100
Subject: [PATCH 218/229] Fix horizontal offset of stacked toast buttons when
 displayed within chat history (buttons going out of side instead of aligning
 to the left)

---
 indra/newview/lltoastnotifypanel.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index aa3ca68980..5d23590413 100755
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -503,6 +503,7 @@ void LLIMToastNotifyPanel::compactButtons()
 
 	const child_list_t* children = getControlPanel()->getChildList();
 	S32 offset = 0;
+	S32 last_bottom = 0; // <FS:Ansariel> Fix stacked buttons offset
 	// Children were added by addChild() which uses push_front to insert them into list,
 	// so to get buttons in correct order reverse iterator is used (EXT-5906) 
 	for (child_list_t::const_reverse_iterator it = children->rbegin(); it != children->rend(); it++)
@@ -510,6 +511,12 @@ void LLIMToastNotifyPanel::compactButtons()
 		LLButton * button = dynamic_cast<LLButton*> (*it);
 		if (button != NULL)
 		{
+			// <FS:Ansariel> Fix stacked buttons offset
+			if (last_bottom != button->getRect().mBottom)
+			{
+				offset = 0;
+			}
+			// </FS:Ansariel>
 			button->setOrigin( offset,button->getRect().mBottom);
 			button->setLeftHPad(2 * HPAD);
 			button->setRightHPad(2 * HPAD);
@@ -522,6 +529,8 @@ void LLIMToastNotifyPanel::compactButtons()
 			button->autoResize();
 			offset += HPAD + button->getRect().getWidth();
 			button->setFollowsNone();
+			// <FS:Ansariel> Fix stacked buttons offset
+			last_bottom = button->getRect().mBottom;
 		}
 	}
 

From 1efba4dad802eb41539cea9c9bef2ccd361b83fa Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 6 Jan 2015 19:19:30 +0100
Subject: [PATCH 219/229] Backed out changeset 09d07fa095d5 in favor of LL fix

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

diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp
index 0a4e4dda98..698f3d5e3f 100755
--- a/indra/llui/llchatentry.cpp
+++ b/indra/llui/llchatentry.cpp
@@ -190,11 +190,8 @@ BOOL LLChatEntry::handleSpecialKey(const KEY key, const MASK mask)
     if (key == KEY_RETURN)
     {
         endOfDoc();
-		// <FS:Ansariel> FIRE-15334: Properly deselect
-        //startSelection();
-        //endSelection();
-		deselect();
-		// </FS:Ansariel>
+        startSelection();
+        endSelection();
     }
 
 	LLTextEditor::handleSpecialKey(key, mask);

From faa17c76c99052b6d3e1b98ea33741e957e5131f Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Thu, 6 Mar 2014 05:51:49 +0200
Subject: [PATCH 220/229] MAINT-3610 FIXED SL viewer partly 'eats'
 chat-messages

---
 indra/llui/llchatentry.cpp  | 10 +---------
 indra/llui/lltexteditor.cpp |  5 +++--
 indra/llui/lltexteditor.h   |  2 ++
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp
index 698f3d5e3f..b0550be5db 100755
--- a/indra/llui/llchatentry.cpp
+++ b/indra/llui/llchatentry.cpp
@@ -53,6 +53,7 @@ LLChatEntry::LLChatEntry(const Params& p)
 	mCurrentHistoryLine = mLineHistory.begin();
 
 	mAutoIndent = false;
+	keepSelectionOnReturn(true);
 }
 
 LLChatEntry::~LLChatEntry()
@@ -185,15 +186,6 @@ BOOL LLChatEntry::handleSpecialKey(const KEY key, const MASK mask)
 {
 	BOOL handled = FALSE;
 
-    // In the case of a chat entry, pressing RETURN when something is selected
-    // should NOT erase the selection (unlike a notecard, for example)
-    if (key == KEY_RETURN)
-    {
-        endOfDoc();
-        startSelection();
-        endSelection();
-    }
-
 	LLTextEditor::handleSpecialKey(key, mask);
 
 	switch(key)
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 8a7c124c22..b5fa253e54 100755
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -264,7 +264,8 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p) :
 	mContextMenu(NULL),
 	mShowContextMenu(p.show_context_menu),
 	mEnableTooltipPaste(p.enable_tooltip_paste),
-	mPassDelete(FALSE)
+	mPassDelete(FALSE),
+	mKeepSelectionOnReturn(false)
 {
 	mSourceID.generate();
 
@@ -1776,7 +1777,7 @@ BOOL LLTextEditor::handleSpecialKey(const KEY key, const MASK mask)
 	case KEY_RETURN:
 		if (mask == MASK_NONE)
 		{
-			if( hasSelection() )
+			if( hasSelection() && !mKeepSelectionOnReturn )
 			{
 				deleteSelection(FALSE);
 			}
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index e3effc8b80..bbc3db5b5e 100755
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -305,6 +305,7 @@ protected:
 
 	/*virtual*/ void	updateSegments();
 	void				updateLinkSegments();
+	void				keepSelectionOnReturn(bool keep) { mKeepSelectionOnReturn = keep; }
 
 private:
 	//
@@ -348,6 +349,7 @@ private:
 	bool			mParseOnTheFly;
 	bool			mEnableTooltipPaste;
 	bool			mPassDelete;
+	bool			mKeepSelectionOnReturn;	// disabling of removing selected text after pressing of Enter
 	
 	LLUUID			mSourceID;
 

From 82d306084ba990b6c0aad1d8b419df3546e5743c Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 6 Jan 2015 20:11:15 +0100
Subject: [PATCH 221/229] Refactor some stuff in LSL preprocessor

---
 indra/newview/fslslpreproc.cpp | 290 +++++++++++++++++----------------
 1 file changed, 153 insertions(+), 137 deletions(-)

diff --git a/indra/newview/fslslpreproc.cpp b/indra/newview/fslslpreproc.cpp
index 6f7c51c7f8..78f52a0c45 100644
--- a/indra/newview/fslslpreproc.cpp
+++ b/indra/newview/fslslpreproc.cpp
@@ -137,7 +137,6 @@ using namespace boost::regex_constants;
 
 std::string FSLSLPreprocessor::encode(std::string script)
 {
-	
 	std::string otext = FSLSLPreprocessor::decode(script);
 	
 	BOOL mono = mono_directive(script);
@@ -157,19 +156,17 @@ std::string FSLSLPreprocessor::encode(std::string script)
 	
 	if(mono)otext += "//mono\n";
 	else otext += "//lsl2\n";
-	
 
 	return otext;
 }
 
 std::string FSLSLPreprocessor::decode(std::string script)
 {
-	
 	static S32 startpoint = encode_start.length();
 	
 	std::string tip = script.substr(0,startpoint);
 	
-	if(tip != encode_start)
+	if (tip != encode_start)
 	{
 		LL_DEBUGS() << "No start" << LL_ENDL;
 		//if(sp != -1)trigger warningg/error?
@@ -178,24 +175,19 @@ std::string FSLSLPreprocessor::decode(std::string script)
 	
 	S32 end = script.find(encode_end);
 	
-	if(end == -1)
+	if (end == -1)
 	{
 		LL_DEBUGS() << "No end" << LL_ENDL;
 		return script;
 	}
-	
 
 	std::string data = script.substr(startpoint,end-startpoint);
 	LL_DEBUGS() << "data = " << data << LL_ENDL;
-	
 
 	std::string otext = data;
 
-	
-
 	otext = boost::regex_replace(otext, boost::regex("([/*])\\|",boost::regex::perl), "$1");
 
-	
 	//otext = curl_unescape(otext.c_str(),otext.length());
 
 	return otext;
@@ -204,30 +196,36 @@ std::string FSLSLPreprocessor::decode(std::string script)
 
 std::string scopeript2(std::string& top, S32 fstart, char left = '{', char right = '}')
 {
-	
-	if(fstart >= int(top.length()))
+	if (fstart >= S32(top.length()))
 	{
 		return "begin out of bounds";
 	}
 	
-	int cursor = fstart;
+	S32 cursor = fstart;
 	bool noscoped = true;
 	bool in_literal = false;
-	int count = 0;
+	S32 count = 0;
 	char ltoken = ' ';
 	
 	do
 	{
 		char token = top.at(cursor);
-		if(token == '"' && ltoken != '\\')in_literal = !in_literal;
-		else if(token == '\\' && ltoken == '\\')token = ' ';
-		else if(!in_literal)
+		if (token == '"' && ltoken != '\\')
 		{
-			if(token == left)
+			in_literal = !in_literal;
+		}
+		else if (token == '\\' && ltoken == '\\')
+		{
+			token = ' ';
+		}
+		else if (!in_literal)
+		{
+			if (token == left)
 			{
 				count += 1;
 				noscoped = false;
-			}else if(token == right)
+			}
+			else if (token == right)
 			{
 				count -= 1;
 				noscoped = false;
@@ -235,9 +233,11 @@ std::string scopeript2(std::string& top, S32 fstart, char left = '{', char right
 		}
 		ltoken = token;
 		cursor += 1;
-	}while((count > 0 || noscoped) && cursor < int(top.length()));
-	int end = (cursor-fstart);
-	if(end > int(top.length()))
+	}
+	while ((count > 0 || noscoped) && cursor < S32(top.length()));
+
+	S32 end = (cursor-fstart);
+	if (end > S32(top.length()))
 	{
 		return "end out of bounds";
 	}
@@ -245,19 +245,20 @@ std::string scopeript2(std::string& top, S32 fstart, char left = '{', char right
 	return top.substr(fstart,(cursor-fstart));
 }
 
-inline int const_iterator_to_pos(std::string::const_iterator begin, std::string::const_iterator cursor)
+inline S32 const_iterator_to_pos(std::string::const_iterator begin, std::string::const_iterator cursor)
 {
 	return std::distance(begin, cursor);
 }
 
 void shredder(std::string& text)
 {
-	int cursor = 0;
-	if(int(text.length()) == 0)
+	S32 cursor = 0;
+	if (text.length() == 0)
 	{
-		text = "y u do dis?";
+		text = "No text to shredder.";
 		return;
 	}
+
 	char ltoken = ' ';
 	do
 	{
@@ -266,7 +267,7 @@ void shredder(std::string& text)
 		{
 			ltoken = token;
 			token = text[++cursor];
-			while(cursor < int(text.length()))
+			while(cursor < S32(text.length()))
 			{
 				if(token == '\\' && ltoken == '\\') token = ' ';
 				if(token == '"' && ltoken != '\\')
@@ -294,13 +295,14 @@ void shredder(std::string& text)
 		}
 		ltoken = token;
 		++cursor;
-	}while(cursor < int(text.length()));
+	}
+	while (cursor < S32(text.length()));
 }
 
 std::string FSLSLPreprocessor::lslopt(std::string script)
 {
 	
-	script = " \n"+script;//HACK//this should prevent regex fail for functions starting on line 0, column 0
+	script = " \n" + script;//HACK//this should prevent regex fail for functions starting on line 0, column 0
 	//added more to prevent split fail on scripts with no global data
 	//this should be fun
 
@@ -327,13 +329,13 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
 			std::set<std::string> kept_functions;
 			std::map<std::string, std::string> functions;
 			
-			while(boost::regex_search(std::string::const_iterator(top.begin()), std::string::const_iterator(top.end()), TOPfmatch, findfuncts, boost::match_default))
+			while (boost::regex_search(std::string::const_iterator(top.begin()), std::string::const_iterator(top.end()), TOPfmatch, findfuncts, boost::match_default))
 			{
 				
 				//std::string type = TOPfmatch[1];
 				std::string funcname = TOPfmatch[2];
 
-				int pos = TOPfmatch.position(boost::match_results<std::string::const_iterator>::size_type(0));
+				S32 pos = TOPfmatch.position(boost::match_results<std::string::const_iterator>::size_type(0));
 				std::string funcb = scopeript2(top, pos);
 				functions[funcname] = funcb;
 				LL_DEBUGS() << "func " << funcname << " added to list[" << funcb << "]" << LL_ENDL;
@@ -346,12 +348,12 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
 				
 				repass = false;
 				std::map<std::string, std::string>::iterator func_it;
-				for(func_it = functions.begin(); func_it != functions.end(); func_it++)
+				for (func_it = functions.begin(); func_it != functions.end(); func_it++)
 				{
 					
 					std::string funcname = func_it->first;
 					
-					if(kept_functions.find(funcname) == kept_functions.end())
+					if (kept_functions.find(funcname) == kept_functions.end())
 					{
 						
 						boost::smatch calls;
@@ -361,7 +363,7 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
 						std::string::const_iterator bstart = bottom.begin();
 						std::string::const_iterator bend = bottom.end();
 
-						if(boost::regex_search(bstart, bend, calls, findcalls, boost::match_default))
+						if (boost::regex_search(bstart, bend, calls, findcalls, boost::match_default))
 						{
 							
 							std::string function = func_it->second;
@@ -371,7 +373,8 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
 						}
 					}
 				}
-			}while(repass);
+			}
+			while (repass);
 
 			std::map<std::string, std::string> gvars;
 			boost::regex findvars("(integer|float|string|key|vector|rotation|list)\\s+([a-zA-Z0-9_]+)([^\\(\\);]*;)");
@@ -384,12 +387,12 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
 				std::string fullref = TOPvmatch[1] + " " + varname+TOPvmatch[3];
 
 				gvars[varname] = fullref;
-				int start = const_iterator_to_pos(std::string::const_iterator(top.begin()), TOPvmatch[1].first);
+				S32 start = const_iterator_to_pos(std::string::const_iterator(top.begin()), TOPvmatch[1].first);
 				top.erase(start,fullref.length());
 			}
 			
 			std::map<std::string, std::string>::iterator var_it;
-			for(var_it = gvars.begin(); var_it != gvars.end(); var_it++)
+			for (var_it = gvars.begin(); var_it != gvars.end(); var_it++)
 			{
 				
 				std::string varname = var_it->first;
@@ -398,7 +401,7 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
 				std::string::const_iterator bstart = bottom.begin();
 				std::string::const_iterator bend = bottom.end();
 				
-				if(boost::regex_search(bstart, bend, vcalls, findvcalls, boost::match_default))
+				if (boost::regex_search(bstart, bend, vcalls, findvcalls, boost::match_default))
 				{
 					bottom = var_it->second + "\n" + bottom;
 				}
@@ -457,17 +460,16 @@ inline std::string shortfile(std::string in)
 class trace_include_files : public boost::wave::context_policies::default_preprocessing_hooks
 {
 public:
-	trace_include_files(FSLSLPreprocessor* proc) 
-    :   mProc(proc) 
-    {
+	trace_include_files(FSLSLPreprocessor* proc)
+	:   mProc(proc) 
+	{
 		mAssetStack.push(LLUUID::null.asString());
 		mFileStack.push(proc->mMainScriptName);
 	}
 
 
 	template <typename ContextT>
-    bool found_include_directive(ContextT const& ctx, 
-        std::string const &filename, bool include_next)
+	bool found_include_directive(ContextT const& ctx, std::string const &filename, bool include_next)
 	{
 		std::string cfilename = filename.substr(1,filename.length()-2);
 		LL_DEBUGS() << cfilename << ":found_include_directive" << LL_ENDL;
@@ -512,13 +514,14 @@ public:
 					}
 				}
 			}
-        }else
+		}
+		else
 		{
 			//todo check on HDD in user defined dir for file in question
 		}
-        //++include_depth;
+		//++include_depth;
 		return false;
-    }
+	}
 
 	template <typename ContextT>
 	void opened_include_file(ContextT const& ctx, 
@@ -530,10 +533,14 @@ public:
 		std::string id;
 		std::string filename = shortfile(relname);//boost::filesystem::path(std::string(relname)).filename();
 		std::map<std::string,LLUUID>::iterator it = mProc->cached_assetids.find(filename);
-		if(it != mProc->cached_assetids.end())
+		if (it != mProc->cached_assetids.end())
 		{
 			id = mProc->cached_assetids[filename].asString();
-		}else id = "NOT_IN_WORLD";//I guess, still need to add external includes atm
+		}
+		else
+		{
+			id = "NOT_IN_WORLD";//I guess, still need to add external includes atm
+		}
 		mAssetStack.push(id);
 		std::string macro = "__ASSETID__";
 		usefulctx.remove_macro_definition(macro, true);
@@ -575,12 +582,14 @@ public:
 	{
 		std::string err;
 		err = "warning: last line of file ends without a newline";
-		if( !err.compare( e.description())){
+		if( !err.compare( e.description()))
+		{
 			err = "Ignoring warning: ";
 			err += e.description();
 			LL_WARNS() << err << LL_ENDL;
 		}
-		else{
+		else
+		{
 			boost::throw_exception(e);
 		}
 	}
@@ -594,7 +603,7 @@ private:
 
 std::string cachepath(std::string name)
 {
-	return gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"lslpreproc",name);
+	return gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "lslpreproc", name);
 }
 
 void cache_script(std::string name, std::string content)
@@ -612,16 +621,15 @@ void cache_script(std::string name, std::string content)
 
 void FSLSLPreprocessor::FSProcCacheCallback(LLVFS *vfs, const LLUUID& iuuid, LLAssetType::EType type, void *userdata, S32 result, LLExtStat extstat)
 {
-	
 	LLUUID uuid = iuuid;
 	LL_DEBUGS() << "cachecallback called" << LL_ENDL;
-	ProcCacheInfo* info =(ProcCacheInfo*)userdata;
+	ProcCacheInfo* info = (ProcCacheInfo*)userdata;
 	LLViewerInventoryItem* item = info->item;
 	FSLSLPreprocessor* self = info->self;
-	if(item && self)
+	if (item && self)
 	{
 		std::string name = item->getName();
-		if(result == LL_ERR_NOERR)
+		if (result == LL_ERR_NOERR)
 		{
 			LLVFile file(vfs, uuid, type);
 			S32 file_length = file.getSize();
@@ -637,13 +645,13 @@ void FSLSLPreprocessor::FSProcCacheCallback(LLVFS *vfs, const LLUUID& iuuid, LLA
 			content += "\n#define __ITEMID__ __UP_ITEMID__\n";*/
 			//prolly wont work and ill have to be not lazy, but worth a try
 			delete buffer;
-			if(boost::filesystem::native(name))
+			if (boost::filesystem::native(name))
 			{
 				LL_DEBUGS() << "native name of " << name << LL_ENDL;
-				self->mCore->mErrorList->setCommentText(std::string("Cached ")+name);
+				self->mCore->mErrorList->setCommentText("Cached " + name);
 				cache_script(name, content);
 				std::set<std::string>::iterator loc = self->caching_files.find(name);
-				if(loc != self->caching_files.end())
+				if (loc != self->caching_files.end())
 				{
 					LL_DEBUGS() << "finalizing cache" << LL_ENDL;
 					self->caching_files.erase(loc);
@@ -666,7 +674,7 @@ void FSLSLPreprocessor::FSProcCacheCallback(LLVFS *vfs, const LLUUID& iuuid, LLA
 		}
 	}
 
-	if(info)
+	if (info)
 	{
 		delete info;
 	}
@@ -678,22 +686,24 @@ void FSLSLPreprocessor::preprocess_script(BOOL close, bool sync, BOOL defcache)
 	mSync = sync;
 	mDefinitionCaching = defcache;
 	caching_files.clear();
-	mCore->mErrorList->setCommentText(std::string("PreProc Starting..."));
+	mCore->mErrorList->setCommentText("PreProc Starting...");
 	
-	LLFile::mkdir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"")+gDirUtilp->getDirDelimiter()+"lslpreproc");
+	LLFile::mkdir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"") + gDirUtilp->getDirDelimiter() + "lslpreproc");
 	std::string script = mCore->mEditor->getText();
-	if(mMainScriptName == "")//more sanity
+	if (mMainScriptName.empty())//more sanity
 	{
 		const LLInventoryItem* item = NULL;
 		LLPreview* preview = (LLPreview*)mCore->mUserdata;
-		if(preview)
+		if (preview)
 		{
 			item = preview->getItem();
 		}
-		if(item)
+
+		if (item)
 		{
 			mMainScriptName = item->getName();
-		}else
+		}
+		else
 		{
 			mMainScriptName = "(Unknown)";
 		}
@@ -703,7 +713,6 @@ void FSLSLPreprocessor::preprocess_script(BOOL close, bool sync, BOOL defcache)
 	cache_script(name, script);
 	//start the party
 	start_process();
-	
 }
 
 const std::string lazy_list_set_func("\
@@ -731,15 +740,15 @@ list lazy_list_set(list target, integer pos, list newval)\n\
 
 std::string reformat_lazy_lists(std::string script)
 {
-	BOOL add_set = FALSE;
+	bool add_set = false;
 	std::string nscript = script;
 	nscript = boost::regex_replace(nscript, boost::regex("([a-zA-Z0-9_]+)\\[([a-zA-Z0-9_()\"]+)]\\s*=\\s*([a-zA-Z0-9_()\"\\+\\-\\*/]+)([;)])",boost::regex::perl), "$1=lazy_list_set($1,$2,[$3])$4");
-	if(nscript != script)
+	if (nscript != script)
 	{
-		add_set = TRUE;
+		add_set = true;
 	}
 
-	if(add_set == TRUE)
+	if (add_set)
 	{
 		//add lazy_list_set function to top of script, as it is used
 		nscript = utf8str_removeCRLF(lazy_list_set_func) + "\n" + nscript;
@@ -748,14 +757,14 @@ std::string reformat_lazy_lists(std::string script)
 }
 
 
-inline std::string randstr(int len, std::string chars)
+inline std::string randstr(S32 len, std::string chars)
 {
-	int clen = int(chars.length());
-	int built = 0;
+	S32 clen = S32(chars.length());
+	S32 built = 0;
 	std::string ret;
-	while(built < len)
+	while (built < len)
 	{
-		int r = std::rand() / ( RAND_MAX / clen );
+		S32 r = std::rand() / ( RAND_MAX / clen );
 		r = r % clen;//sanity
 		ret += chars.at(r);
 		built += 1;
@@ -765,12 +774,12 @@ inline std::string randstr(int len, std::string chars)
 
 inline std::string quicklabel()
 {
-	return std::string("c")+randstr(5,"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
+	return std::string("c") + randstr(5, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
 }
 
 std::string minimalize_whitespace(std::string in)
 {
-	return boost::regex_replace(in, boost::regex("\\s*",boost::regex::perl), "\n");		
+	return boost::regex_replace(in, boost::regex("\\s*",boost::regex::perl), "\n");
 }
 
 std::string reformat_switch_statements(std::string script)
@@ -785,13 +794,13 @@ std::string reformat_switch_statements(std::string script)
 
 			static std::string switchstr = "switch(";
 
-			int escape = 100;
+			S32 escape = 100;
 
 			while(boost::regex_search(std::string::const_iterator(buffer.begin()), std::string::const_iterator(buffer.end()), matches, findswitches, boost::match_default) && escape > 1)
 			{
-				int res = matches.position(boost::match_results<std::string::const_iterator>::size_type(0))+1;
+				S32 res = matches.position(boost::match_results<std::string::const_iterator>::size_type(0))+1;
 				
-				static int slen = switchstr.length();
+				static S32 slen = switchstr.length();
 
 				std::string arg = scopeript2(buffer, res+slen-1,'(',')');
 
@@ -804,7 +813,7 @@ std::string reformat_switch_statements(std::string script)
 				LL_DEBUGS() << "arg=[" << arg << "]" << LL_ENDL;;
 				std::string rstate = scopeript2(buffer, res+slen+arg.length()-1);
 
-				int cutlen = slen;
+				S32 cutlen = slen;
 				cutlen -= 1;
 				cutlen += arg.length();
 				cutlen += rstate.length();
@@ -812,7 +821,7 @@ std::string reformat_switch_statements(std::string script)
 				//then add arg len and state len to get section to excise
 
 				//rip off the scope edges
-				int slicestart = rstate.find("{")+1;
+				S32 slicestart = rstate.find("{")+1;
 				rstate = rstate.substr(slicestart,(rstate.rfind("}")-slicestart)-1);
 				LL_DEBUGS() << "rstate=[" << rstate << "]" << LL_ENDL;
 
@@ -826,11 +835,11 @@ std::string reformat_switch_statements(std::string script)
 				{
 					//if(statematches[0].matched)
 					{
-						int case_start = statematches.position(boost::match_results<std::string::const_iterator>::size_type(0))+1;//const_iterator2pos(statematches[0].first+1, std::string::const_iterator(rstate.begin()))-1;
-						int next_curl = rstate.find("{",case_start+1);
-						int next_semi = rstate.find(":",case_start+1);
-						int case_end = (next_curl < next_semi && next_curl != -1) ? next_curl : next_semi;
-						static int caselen = std::string("case").length();
+						S32 case_start = statematches.position(boost::match_results<std::string::const_iterator>::size_type(0))+1;//const_iterator2pos(statematches[0].first+1, std::string::const_iterator(rstate.begin()))-1;
+						S32 next_curl = rstate.find("{",case_start+1);
+						S32 next_semi = rstate.find(":",case_start+1);
+						S32 case_end = (next_curl < next_semi && next_curl != -1) ? next_curl : next_semi;
+						static S32 caselen = std::string("case").length();
 						if(case_end != -1)
 						{
 							std::string casearg = rstate.substr(case_start+caselen,case_end-(case_start+caselen));
@@ -929,11 +938,12 @@ std::string reformat_switch_statements(std::string script)
 
 void FSLSLPreprocessor::start_process()
 {
-	if(mWaving)
+	if (mWaving)
 	{
 		LL_WARNS() << "already waving?" << LL_ENDL;
 		return;
 	}
+
 	mWaving = TRUE;
 	boost::wave::util::file_position_type current_position;
 	std::string input = mCore->mEditor->getText();
@@ -945,31 +955,34 @@ void FSLSLPreprocessor::start_process()
 	std::string name = mMainScriptName;
 	bool lazy_lists = gSavedSettings.getBOOL("_NACL_PreProcLSLLazyLists");
 	bool use_switch = gSavedSettings.getBOOL("_NACL_PreProcLSLSwitch");
+	bool use_optimizer = gSavedSettings.getBOOL("_NACL_PreProcLSLOptimizer");
+	bool enable_hdd_include = gSavedSettings.getBOOL("_NACL_PreProcEnableHDDInclude");
+	bool use_compression = gSavedSettings.getBOOL("_NACL_PreProcLSLTextCompress");
 	std::string settings;
 	settings = "Settings: preproc ";
 	if (lazy_lists)
 	{
-	  settings = settings + " Lazy Lists";
-	} 
+		settings = settings + " Lazy Lists";
+	}
 	if (use_switch)
 	{
-	  settings = settings + " Switches";
+		settings = settings + " Switches";
 	}
-	if(gSavedSettings.getBOOL("_NACL_PreProcLSLOptimizer"))
+	if (use_optimizer)
 	{
-		  settings = settings + " Optimize";
+		settings = settings + " Optimize";
 	}
-	if(gSavedSettings.getBOOL("_NACL_PreProcEnableHDDInclude"))
+	if (enable_hdd_include)
 	{
-		   settings = settings + " HDDInclude";
+		settings = settings + " HDDInclude";
 	}
-	if(gSavedSettings.getBOOL("_NACL_PreProcLSLTextCompress"))
+	if (use_compression)
 	{
-			settings = settings + " Compress";
+		settings = settings + " Compress";
 	}
 	//display the settings
-	 mCore->mErrorList->setCommentText(std::string(settings));
-	 
+	mCore->mErrorList->setCommentText(settings);
+
 	LL_DEBUGS() << settings << LL_ENDL;
 	bool errored = false;
 	std::string err;
@@ -986,29 +999,29 @@ void FSLSLPreprocessor::start_process()
 		ctx.set_language(boost::wave::enable_prefer_pp_numbers(ctx.get_language()));
 		ctx.set_language(boost::wave::enable_variadics(ctx.get_language()));
 		
-		std::string path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"")+gDirUtilp->getDirDelimiter()+"lslpreproc"+gDirUtilp->getDirDelimiter();
+		std::string path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"") + gDirUtilp->getDirDelimiter() + "lslpreproc" + gDirUtilp->getDirDelimiter();
 		ctx.add_include_path(path.c_str());
-		if(gSavedSettings.getBOOL("_NACL_PreProcEnableHDDInclude"))
+		if (enable_hdd_include)
 		{
 			std::string hddpath = gSavedSettings.getString("_NACL_PreProcHDDIncludeLocation");
-			if(hddpath != "")
+			if (!hddpath.empty())
 			{
 				ctx.add_include_path(hddpath.c_str());
 				ctx.add_sysinclude_path(hddpath.c_str());
 			}
 		}
-		std::string def = llformat("__AGENTKEY__=\"%s\"",gAgent.getID().asString().c_str());//legacy because I used it earlier
+		std::string def = llformat("__AGENTKEY__=\"%s\"", gAgentID.asString().c_str());//legacy because I used it earlier
 		ctx.add_macro_definition(def,false);
-		def = llformat("__AGENTID__=\"%s\"",gAgent.getID().asString().c_str());
+		def = llformat("__AGENTID__=\"%s\"", gAgentID.asString().c_str());
 		ctx.add_macro_definition(def,false);
-		def = llformat("__AGENTIDRAW__=%s",gAgent.getID().asString().c_str());
+		def = llformat("__AGENTIDRAW__=%s", gAgentID.asString().c_str());
 		ctx.add_macro_definition(def,false);
 		std::string aname = gAgentAvatarp->getFullname();
-		def = llformat("__AGENTNAME__=\"%s\"",aname.c_str());
+		def = llformat("__AGENTNAME__=\"%s\"", aname.c_str());
 		ctx.add_macro_definition(def,false);
-		def = llformat("__ASSETID__=%s",LLUUID::null.asString().c_str());
+		def = llformat("__ASSETID__=%s", LLUUID::null.asString().c_str());
 		ctx.add_macro_definition(def,false);
-		def = llformat("__SHORTFILE__=\"%s\"",name.c_str());
+		def = llformat("__SHORTFILE__=\"%s\"", name.c_str());
 		ctx.add_macro_definition(def,false);
 
 		ctx.add_macro_definition("list(input)=((list)(input))",false);
@@ -1023,15 +1036,15 @@ void FSLSLPreprocessor::start_process()
 
 		context_type::iterator_type first = ctx.begin();
 		context_type::iterator_type last = ctx.end();
-	        
-        while (first != last)
+
+		while (first != last)
 		{
-			if(caching_files.size() != 0)
+			if (caching_files.size() != 0)
 			{
 				mWaving = FALSE;
 				return;
 			}
-            current_position = (*first).get_position();
+			current_position = (*first).get_position();
 			
 			std::string token = std::string((*first).get_value().c_str());//stupid boost bitching even though we know its a std::string
 			
@@ -1042,17 +1055,17 @@ void FSLSLPreprocessor::start_process()
 
 			output += token;
 			
-			if(lazy_lists == FALSE)
+			if (!lazy_lists)
 			{
 				lazy_lists = ctx.is_defined_macro(std::string("USE_LAZY_LISTS"));
 			}
 			
-			if(use_switch == FALSE)
+			if (!use_switch)
 			{
 				use_switch = ctx.is_defined_macro(std::string("USE_SWITCHES"));
 			}
-            ++first;
-        }
+			++first;
+		}
 	}
 	catch(boost::wave::cpp_exception const& e)
 	{
@@ -1081,31 +1094,33 @@ void FSLSLPreprocessor::start_process()
 		mCore->mErrorList->setCommentText(err);
 	}
 
-	if(!errored)
+	if (!errored)
 	{
 		FAILDEBUG
-		if(lazy_lists == TRUE)
+		if (lazy_lists)
 		{
 			try
 			{
 				mCore->mErrorList->setCommentText("Applying lazy list set transform");
 				output = reformat_lazy_lists(output);
-			}catch(...)
-			{	
+			}
+			catch(...)
+			{
 				errored = TRUE;
 				err = "unexpected exception in lazy list converter.";
 				mCore->mErrorList->setCommentText(err);
 			}
 
 		}
-		if(use_switch == TRUE)
+		if (use_switch)
 		{
 			try
 			{
 				mCore->mErrorList->setCommentText("Applying switch statement transform");
 				output = reformat_switch_statements(output);
-			}catch(...)
-			{	
+			}
+			catch(...)
+			{
 				errored = TRUE;
 				err = "unexpected exception in switch statement converter.";
 				mCore->mErrorList->setCommentText(err);
@@ -1113,11 +1128,11 @@ void FSLSLPreprocessor::start_process()
 		}
 	}
 
-	if(!mDefinitionCaching)
+	if (!mDefinitionCaching)
 	{
-		if(!errored)
+		if (!errored)
 		{
-			if(gSavedSettings.getBOOL("_NACL_PreProcLSLOptimizer"))
+			if (use_optimizer)
 			{
 				mCore->mErrorList->setCommentText("Optimizing out unreferenced user-defined functions and global variables");
 				try
@@ -1132,32 +1147,33 @@ void FSLSLPreprocessor::start_process()
 				}
 			}
 		}
-		if(!errored)
+		if (!errored)
 		{
-			if(gSavedSettings.getBOOL("_NACL_PreProcLSLTextCompress"))
+			if (use_compression)
 			{
 				mCore->mErrorList->setCommentText("Compressing lsltext by removing unnecessary space");
 				try
 				{
 					output = lslcomp(output);
-				}catch(...)
-				{	
+				}
+				catch(...)
+				{
 					errored = TRUE;
 					err = "unexpected exception in lsl compressor";
 					mCore->mErrorList->setCommentText(err);
 				}
 			}
 		}
-		output = encode(rinput)+"\n\n"+output;
+		output = encode(rinput) + "\n\n" + output;
 
 
 		LLTextEditor* outfield = mCore->mPostEditor;//getChild<LLViewerTextEditor>("post_process");
-		if(outfield)
+		if (outfield)
 		{
 			outfield->setText(LLStringExplicit(output));
 		}
 		mCore->mPostScript = output;
-		mCore->doSaveComplete((void*)mCore,mClose,mSync);
+		mCore->doSaveComplete((void*)mCore, mClose, mSync);
 	}
 	mWaving = FALSE;
 }
@@ -1208,13 +1224,13 @@ bool FSLSLPreprocessor::mono_directive(std::string const& text, bool agent_inv)
 {
 	bool domono = agent_inv;
 	
-	if(text.find("//mono\n") != -1)
+	if (text.find("//mono\n") != -1)
 	{
-		domono = TRUE;
+		domono = true;
 	}
-	else if(text.find("//lsl2\n") != -1)
+	else if (text.find("//lsl2\n") != -1)
 	{
-		domono = FALSE;
+		domono = false;
 	}
 	return domono;
 }

From bb0329d01216c15ea27ee03e713f9a451f9d53bd Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Wed, 7 Jan 2015 01:34:44 +0100
Subject: [PATCH 222/229] Add debug floater to show how much texture memory
 objects in view use (per object).

---
 indra/llrender/llgltexture.h                  |   5 +-
 indra/newview/CMakeLists.txt                  |   2 +
 indra/newview/fsfloatervramusage.cpp          | 343 ++++++++++++++++++
 indra/newview/fsfloatervramusage.h            |  61 ++++
 indra/newview/llface.cpp                      |  17 +
 indra/newview/llselectmgr.cpp                 |  15 +
 indra/newview/llselectmgr.h                   |  47 ++-
 indra/newview/llviewerfloaterreg.cpp          |   5 +
 .../default/xui/en/fs_floater_vram_usage.xml  |  73 ++++
 .../skins/default/xui/en/menu_viewer.xml      |   7 +
 10 files changed, 573 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/fsfloatervramusage.cpp
 create mode 100644 indra/newview/fsfloatervramusage.h
 create mode 100644 indra/newview/skins/default/xui/en/fs_floater_vram_usage.xml

diff --git a/indra/llrender/llgltexture.h b/indra/llrender/llgltexture.h
index 45592ee077..a62b24c0ab 100644
--- a/indra/llrender/llgltexture.h
+++ b/indra/llrender/llgltexture.h
@@ -192,7 +192,10 @@ protected:
 protected:
 	LLGLTextureState  mTextureState ;
 
-
+// <FS>ND> Expose mipmap generation so we can check it for texture memory tax
+public:
+	bool getUseMipMaps() const { return mUseMipMaps; }
+// </FS:ND>
 };
 
 #endif // LL_GL_TEXTURE_H
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 02859310c6..f906f5659a 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -208,6 +208,7 @@ set(viewer_SOURCE_FILES
     lggcontactsets.cpp
     lfsimfeaturehandler.cpp
     llpanelopenregionsettings.cpp
+	fsfloatervramusage.cpp
 
     llaccountingcostmanager.cpp
     llagent.cpp
@@ -926,6 +927,7 @@ set(viewer_HEADER_FILES
     lggbeamscolors.h
     lggcontactsets.h
     lfsimfeaturehandler.h
+	fsfloatervramusage.h
 
     llaccountingcostmanager.h
     llagent.h
diff --git a/indra/newview/fsfloatervramusage.cpp b/indra/newview/fsfloatervramusage.cpp
new file mode 100644
index 0000000000..3e6d0df0c8
--- /dev/null
+++ b/indra/newview/fsfloatervramusage.cpp
@@ -0,0 +1,343 @@
+/**
+ * $LicenseInfo:firstyear=2015&license=viewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (c) 2015 Nicky Dasmijn
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "fsfloatervramusage.h"
+#include "llscrolllistctrl.h"
+#include "llviewerobjectlist.h"
+#include "lldrawable.h"
+#include "llviewertexture.h"
+#include "lltoolpie.h"
+#include "llfloaterreg.h"
+#include "llface.h"
+#include "llvertexbuffer.h"
+#include "llcallbacklist.h"
+#include "llvoavatarself.h"
+#include "llagentcamera.h"
+
+const F32 PROPERTIES_REQUEST_TIMEOUT = 10.0f;
+const F32 PROPERY_REQUEST_INTERVAL = 2.0f;
+const U32 PROPERTIES_MAX_REQUEST_COUNT = 250;
+
+static void onIdle( void *aData )
+{
+	FSFloaterVRAMUsage *pFloater = reinterpret_cast<FSFloaterVRAMUsage*>(aData);
+	pFloater->onIdle();
+}
+
+struct ObjectStat
+{
+	LLUUID mId;
+	U32 mTextureSize;
+};
+
+struct FSFloaterVRAMUsage::ImplData
+{
+	LLScrollListCtrl *mList;
+	LLObjectSelectionHandle mSelection;
+	U32 mPending;
+	LLFrameTimer mPropTimer;
+
+	std::deque< ObjectStat > mObjects;
+};
+
+bool sortByTexture( ObjectStat const &lhs, ObjectStat const &rhs )
+{
+	return lhs.mTextureSize > rhs.mTextureSize;
+}
+
+FSFloaterVRAMUsage::FSFloaterVRAMUsage(const LLSD& seed)
+	: LLFloater( seed )
+{
+	mData = new ImplData();
+	mData->mList = 0;
+	mData->mPending = 0;
+
+ 	gIdleCallbacks.addFunction( &::onIdle, this) ;
+}
+
+FSFloaterVRAMUsage::~FSFloaterVRAMUsage()
+{
+ 	gIdleCallbacks.deleteFunction( &::onIdle, this );
+	delete mData;
+	LLSelectMgr::instance().removePropertyListener( this );
+	LLSelectMgr::instance().enableSilhouette( TRUE );
+}
+
+void FSFloaterVRAMUsage::onOpen(const LLSD& key)
+{
+}
+
+BOOL FSFloaterVRAMUsage::postBuild()
+{
+	LLButton *pRefresh = getChild< LLButton >( "refresh_button" );
+	pRefresh->setClickedCallback( boost::bind( &FSFloaterVRAMUsage::doRefresh, this ) );
+
+	mData->mList = getChild< LLScrollListCtrl >( "result_list" );
+
+	LLSelectMgr::instance().registerPropertyListener( this );
+	LLSelectMgr::instance().enableSilhouette( FALSE );
+
+	return TRUE;
+}
+
+void FSFloaterVRAMUsage::onIdle()
+{
+	if( !mData->mPending && mData->mObjects.empty() )
+	{
+		LLSelectMgr::instance().deselectAll();
+		return;
+	}
+	
+	if( mData->mPending && mData->mPropTimer.getElapsedTimeF32() < PROPERTIES_REQUEST_TIMEOUT ) 
+		return;
+
+	if( !mData->mPending && mData->mPropTimer.getStarted() && mData->mPropTimer.getElapsedTimeF32() < PROPERY_REQUEST_INTERVAL ) 
+		return;
+
+	LLSelectMgr::instance().deselectAll();
+	mData->mPending = 0;
+
+	std::vector< LLViewerObject* > vctSelection;
+	std::deque< ObjectStat > withoutRegion;
+
+	while( mData->mPending < PROPERTIES_MAX_REQUEST_COUNT && !mData->mObjects.empty() )
+	{
+		LLViewerObject *pObj = gObjectList.findObject(  mData->mObjects[ 0 ].mId );
+		if( pObj && pObj->getRegion() )
+		{
+			++mData->mPending;
+			vctSelection.push_back( pObj );
+		}
+		else if( pObj )
+			withoutRegion.push_back( mData->mObjects[0] );
+
+		mData->mObjects.erase( mData->mObjects.begin() );
+	}
+
+	mData->mObjects.insert( mData->mObjects.end(), withoutRegion.begin(), withoutRegion.end() );
+
+	mData->mPropTimer.start();
+	if( vctSelection.size() )
+	{
+		LLSelectMgr::instance().enableBatchMode();
+		mData->mSelection = LLSelectMgr::instance().selectObjectAndFamily( vctSelection );
+		LLSelectMgr::instance().disableBatchMode();
+	}
+}
+
+U32 FSFloaterVRAMUsage::calcTexturSize( LLViewerObject *aObject, std::ostream *aTooltip )
+{
+	if( !aObject || !aObject->mDrawable || aObject->mDrawable->isDead() )
+		return 0;
+
+	std::map< LLUUID, U32 > stTextures;
+
+	F64 totalTexSize = 0;
+	U8 numTEs = aObject->getNumTEs();
+
+	if (aTooltip )
+		*aTooltip << (U32)numTEs << " TEs" << std::endl;
+
+	for( U8 j = 0; j < numTEs; ++j )
+	{
+		LLViewerTexture *pTex = aObject->getTEImage( j );
+		if( !pTex || pTex->isMissingAsset() )
+			continue;
+
+		U32 textureId = stTextures.size();
+		bool bOldTexId( false );
+
+		if( stTextures.end() != stTextures.find( pTex->getID() ) )
+		{
+			textureId = stTextures[ pTex->getID() ];
+			bOldTexId = true;
+		}
+
+		if (aTooltip )
+			*aTooltip << "TE: " << (U32)j << " tx: " << textureId	<< " w/h/c " << pTex->getFullWidth() << "/" << pTex->getFullHeight() << "/" << (U32)pTex->getComponents() << std::endl;
+
+		if( bOldTexId )
+			continue;
+
+		stTextures[ pTex->getID() ] = textureId;
+
+		S32 texSize = pTex->getFullWidth() * pTex->getFullHeight() * pTex->getComponents();
+		if( pTex->getUseMipMaps() )
+			texSize += (texSize*33)/100;
+
+		totalTexSize += texSize;
+	}
+
+	totalTexSize /= 1024.0;
+	return static_cast< U32 >( totalTexSize );
+}
+
+void FSFloaterVRAMUsage::doRefresh()
+{
+	mData->mList->deleteAllItems();
+	S32 numObjects = gObjectList.getNumObjects();
+
+	mData->mPending = 0;
+	mData->mObjects.clear();
+	LLSelectMgr::instance().deselectAll();
+
+	for( S32 i = 0; i < numObjects; ++i )
+	{
+		LLViewerObject *pObj = gObjectList.getObject( i );
+		if( !pObj ) // Might be dead
+			continue;
+
+		if( !pObj->mbCanSelect ||
+			pObj->getPCode() == LLViewerObject::LL_VO_SURFACE_PATCH ||
+			pObj->getPCode() == LLViewerObject::LL_VO_SKY ||
+			pObj->getPCode() == LLViewerObject::LL_VO_WL_SKY ||
+			pObj->getPCode() == LLViewerObject::LL_VO_VOID_WATER ||
+			pObj->getPCode() == LLViewerObject::LL_VO_WATER ||
+			pObj->isAvatar() )
+			continue;
+
+		// Exclude everything that's not in a sphere with r=draw distance around the avatar.
+		F64 distance = (pObj->getPositionGlobal() - gAgentAvatarp->getPositionGlobal()).length();
+		if( distance > gAgentCamera.mDrawDistance )
+			continue;
+
+		ObjectStat oObject;
+		oObject.mId = pObj->getID();
+		oObject.mTextureSize = calcTexturSize( pObj );
+
+		mData->mObjects.push_back( oObject );
+	}
+	std::sort( mData->mObjects.begin(), mData->mObjects.end(), sortByTexture );
+}
+
+void FSFloaterVRAMUsage::addObjectToList( LLViewerObject *aObject, std::string const &aName )
+{
+	LLScrollListItem::Params item;
+
+	F64 distance = (aObject->getPositionGlobal() - gAgentAvatarp->getPositionGlobal()).length();
+
+	item.columns.add().column("uuid").value( aObject->getID() );
+	item.columns.add().column("name").value( aName );
+	item.columns.add().column("distance").value( distance );
+	item.columns.add().column("faces").value( aObject->getNumFaces() );
+	item.columns.add().column("vertices").value( static_cast<S32>( aObject->getNumVertices() ) );
+	item.columns.add().column("indices").value( static_cast<S32>( aObject->getNumIndices() ) );
+
+	std::stringstream strTooltip;
+	U32 totalTexSize = calcTexturSize( aObject, &strTooltip );
+
+	F64 totalVboSize(0.0);
+
+	LLPointer< LLDrawable > pDrawable = aObject->mDrawable;
+	S32 numFaces = 0;
+	if( pDrawable && !pDrawable->isDead() )
+		numFaces = pDrawable->getNumFaces();
+
+	strTooltip << numFaces << " faces" << std::endl;
+	for (S32 j = 0; j < numFaces; j++)
+	{
+		LLFace* pFace = pDrawable->getFace( j );
+		if( !pFace )
+			continue;
+
+		S32 cmW = 0, cmH = 0;
+
+		calcFaceSize( pFace, cmW, cmH );
+
+		strTooltip << "Face: " << j << " extends (cm) w/h " << cmW << "/" << cmH << std::endl;
+
+		S32 vertexSize = calcVBOEntrySize( pFace->getVertexBuffer() ) * aObject->getNumVertices();;
+		S32 indexSize = sizeof( S16 ) * aObject->getNumIndices();
+
+		totalVboSize += vertexSize;
+		totalVboSize += indexSize;
+	}
+
+	totalVboSize /= 1024.0;
+
+	item.columns.add().column("vram_usage").value( (S32)totalTexSize );
+	item.columns.add().column("vram_usage_vbo").value( (S32)totalVboSize );
+
+	LLScrollListItem *pRow = mData->mList->addRow( item );
+	if( pRow )
+	{
+		for( S32 j = 0; j < pRow->getNumColumns(); ++j )
+			pRow->getColumn( j )->setToolTip( strTooltip.str() );
+	}
+}
+
+void FSFloaterVRAMUsage::calcFaceSize( LLFace *aFace, S32 &aW, S32 &aH )
+{
+	aW = aH = 0;
+	if( !aFace )
+		return;
+
+	LLVector4a size;
+	size.setSub( aFace->mExtents[1], aFace->mExtents[0] );
+
+	S32 cmX = static_cast<S32>( size[0]*100 );
+	S32 cmY = static_cast<S32>( size[1]*100 );
+	S32 cmZ = static_cast<S32>( size[2]*100 );
+
+	aW = cmX;
+	aH = cmY;
+
+	if( 0 != cmZ )
+	{
+		if( 0 == aW )
+			aW = cmZ;
+		else
+			aH = cmZ;
+	}
+}
+
+S32 FSFloaterVRAMUsage::calcVBOEntrySize( LLVertexBuffer *aVBO )
+{
+	if( !aVBO )
+		return 0;
+
+	S32 vboEntrySize(0);
+
+	U32 vboMask = aVBO->getTypeMask();
+	for( S32 k = 0, l = 1; k < LLVertexBuffer::TYPE_MAX; ++k )
+	{
+		if( vboMask & l && k != LLVertexBuffer::TYPE_TEXTURE_INDEX )
+			vboEntrySize += LLVertexBuffer::sTypeSize[ k ];
+		l = l << 1;
+	}
+
+	return vboEntrySize;
+}
+
+void FSFloaterVRAMUsage::onProperties( LLSelectNode const *aProps )
+{
+	if( !aProps && !aProps->getObject() )
+		return;
+
+	LLUUID id = aProps->getObject()->getID();
+	LLViewerObject *pObj = gObjectList.findObject( id );
+	addObjectToList( pObj, aProps->mName );
+}
diff --git a/indra/newview/fsfloatervramusage.h b/indra/newview/fsfloatervramusage.h
new file mode 100644
index 0000000000..19984dc0cd
--- /dev/null
+++ b/indra/newview/fsfloatervramusage.h
@@ -0,0 +1,61 @@
+/**
+ * $LicenseInfo:firstyear=2015&license=viewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (c) 2015 Nicky Dasmijn
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
+ */
+
+#ifndef FS_FLOATERVRAMUSAGE_H
+#define FS_FLOATERVRAMUSAGE_H
+
+#include "llfloater.h"
+#include "llselectmgr.h"
+
+class LLScrollListCtrl;
+class LLViewerObject;
+class LLFace;
+class LLVertexBuffer;
+
+class FSFloaterVRAMUsage : public LLFloater, public nd::selection::PropertiesListener
+{
+public:
+	FSFloaterVRAMUsage(const LLSD& seed);
+	/*virtual*/ ~FSFloaterVRAMUsage();
+	/*virtual*/ void onOpen(const LLSD& key);
+
+	BOOL postBuild();
+
+	virtual void onProperties( LLSelectNode const * );
+
+	void onIdle();
+
+private:
+	void doRefresh();
+
+	void addObjectToList( LLViewerObject*, std::string const& );
+	void calcFaceSize( LLFace *aFace, S32 &aW, S32 &aH );
+	S32 calcVBOEntrySize( LLVertexBuffer *aVBO );
+	U32 calcTexturSize( LLViewerObject*, std::ostream * = 0 );
+
+	struct ImplData;
+	ImplData *mData;
+};
+
+#endif // FS_FLOATERBLOCKLIST_H
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 10fd4a9c47..0250a871c3 100755
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -954,6 +954,23 @@ LLVector2 LLFace::surfaceToTexture(LLVector2 surface_coord, const LLVector4a& po
 void LLFace::getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_pos, F32* scale) const
 {
 	const LLMatrix4& vol_mat = getWorldMatrix();
+	if( ! getViewerObject() )
+	{
+		LL_WARNS() << "No viewer object" << LL_ENDL;
+		return;
+	}
+	if( ! getViewerObject()->getVolume() )
+	{
+		LL_WARNS() << "No volume" << LL_ENDL;
+		return;
+	}
+
+	if( getViewerObject()->getVolume()->getNumVolumeFaces() <= mTEOffset )
+	{
+		LL_WARNS() << "No volume face" << (S32)mTEOffset << LL_ENDL;
+		return;
+	}
+
 	const LLVolumeFace& vf = getViewerObject()->getVolume()->getVolumeFace(mTEOffset);
 	const LLVector4a& normal4a = vf.mNormals[0];
 	const LLVector4a& tangent = vf.mTangents[0];
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index cc47e394bc..10a876f585 100755
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -490,6 +490,9 @@ LLObjectSelectionHandle LLSelectMgr::selectObjectAndFamily(const std::vector<LLV
 		object->addThisAndNonJointChildren(objects);
 		addAsFamily(objects);
 
+		if( isBatchMode() )
+			continue;
+
 		// Stop the object from moving (this anticipates changes on the
 		// simulator in LLTask::userSelect)
 		object->setVelocity(LLVector3::zero);
@@ -498,6 +501,14 @@ LLObjectSelectionHandle LLSelectMgr::selectObjectAndFamily(const std::vector<LLV
 		object->resetRot();
 	}
 
+	if( isBatchMode() )
+	{
+		mShowSelection = FALSE;
+		sendSelect();
+		return mSelectedObjects;
+	}
+
+
 	updateSelectionCenter();
 	saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
 	updatePointAt();
@@ -5343,6 +5354,10 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
 			node->mInventorySerial = inv_serial;
 			node->mSitName.assign(sit_name);
 			node->mTouchName.assign(touch_name);
+
+			// <FS:ND> Fire for any observer interested in object properties
+			LLSelectMgr::instance().firePropertyReceived( node );
+			// </FS:ND>
 		}
 	}
 
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 417c24dd74..ed24549961 100755
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -234,6 +234,11 @@ protected:
 	LLPointer<LLViewerObject>	mObject;
 	S32				mTESelectMask;
 	S32				mLastTESelected;
+
+// <FS:ND> For const access. Need to check for isDead yourself.
+public:
+	LLViewerObject const* getObject() const { return mObject; } 
+// </FS:ND>
 };
 
 class LLObjectSelection : public LLRefCount
@@ -397,7 +402,47 @@ extern template class LLSelectMgr* LLSingleton<class LLSelectMgr>::getInstance()
 // For use with getFirstTest()
 struct LLSelectGetFirstTest;
 
-class LLSelectMgr : public LLEditMenuHandler, public LLSingleton<LLSelectMgr>
+// <FS:ND> To listened into received prop. messages
+namespace nd
+{
+	namespace selection
+	{
+		class PropertiesListener
+		{
+		public:
+			virtual void onProperties( LLSelectNode const * ) = 0;
+		};
+
+		class PropertiesServer
+		{
+		public:
+			PropertiesServer()
+				: mBatchMode( false )
+			{ }
+
+			void registerPropertyListener( nd::selection::PropertiesListener *aP) { mListener.insert( aP ); }
+			void removePropertyListener( nd::selection::PropertiesListener *aP) { mListener.erase( aP ); }
+
+			void enableBatchMode( ) { mBatchMode = true; }
+			void disableBatchMode( ) { mBatchMode = false; }
+			bool isBatchMode() const { return mBatchMode; }
+
+		protected:
+			void firePropertyReceived( LLSelectNode const *aNode  )
+			{
+				for( std::set< nd::selection::PropertiesListener * >::iterator itr = mListener.begin(); itr != mListener.end(); ++itr )
+					(*itr)->onProperties( aNode );
+			}
+
+		private:
+			std::set< nd::selection::PropertiesListener * > mListener;
+			bool mBatchMode;
+		};
+	}
+}
+// </FS:ND>
+
+class LLSelectMgr : public LLEditMenuHandler, public LLSingleton<LLSelectMgr>, public nd::selection::PropertiesServer
 {
 public:
 	static BOOL					sRectSelectInclusive;	// do we need to surround an object to pick it?
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index da47c5c449..47d7e658cc 100755
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -187,6 +187,9 @@
 #include "NACLfloaterexploresounds.h"
 #include "particleeditor.h"
 #include "quickprefs.h"
+
+#include "fsfloatervramusage.h"
+
 // handle secondlife:///app/openfloater/{NAME} URLs
 class LLFloaterOpenHandler : public LLCommandHandler
 {
@@ -427,5 +430,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("sound_explorer", "floater_NACL_explore_sounds.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<NACLFloaterExploreSounds>);
 	LLFloaterReg::add("ws_asset_blacklist", "floater_asset_blacklist.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterWSAssetBlacklist>);
 
+	LLFloaterReg::add( "vram_usage", "fs_floater_vram_usage.xml", static_cast<LLFloaterBuildFunc>( &LLFloaterReg::build< FSFloaterVRAMUsage >) );
+
 	LLFloaterReg::registerControlVariables(); // Make sure visibility and rect controls get preserved when saving
 }
diff --git a/indra/newview/skins/default/xui/en/fs_floater_vram_usage.xml b/indra/newview/skins/default/xui/en/fs_floater_vram_usage.xml
new file mode 100644
index 0000000000..63179d7aa6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/fs_floater_vram_usage.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ positioning="centered"
+ legacy_header_height="18"
+ can_resize="true"
+ default_tab_group="1"
+ height="350"
+ layout="topleft"
+ min_height="160"
+ min_width="270"
+ name="object_vram_usage"
+ help_topic=""
+ save_rect="true"
+ title="Object impact on VRAM"
+ width="400">
+    <scroll_list
+        name="result_list"
+        left="10"
+        right="-10"
+        top="14"
+        bottom="-32"
+        follows="left|top|bottom|right"
+        can_resize="true"
+        column_padding="0"
+        draw_heading="true"
+        multi_select="false"
+        search_column="6">
+      <column
+          name="uuid"
+          label="uuid"
+		  width="0"/>
+      <column
+          name="name"
+          label="Name"
+          dynamicwidth="true"/>
+      <column
+          name="distance"
+          label="Distance"
+          dynamicwidth="true"/>
+      <column
+          name="faces"
+          label="Faces"
+          dynamicwidth="true"/>
+      <column
+          name="vertices"
+          label="Vertices"
+          dynamicwidth="true"/>
+      <column
+          name="indices"
+          label="Indices"
+          dynamicwidth="true"/>
+      <column
+          name="vram_usage"
+          label="VRAM (Textures) in kb"
+          dynamicwidth="true"/>
+      <column
+          name="vram_usage_vbo"
+          label="VRAM (VBO) in kb"
+          dynamicwidth="true"/>
+    </scroll_list>
+    <button
+     follows="bottom|left"
+	 left="10"
+	 top="-25"
+     height="23"
+     label="Refresh"
+     label_selected="Refresh"
+     layout="topleft"
+     left_pad="10"
+     name="refresh_button"
+     width="120">
+    </button>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 4868a0b65e..4728816925 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3287,6 +3287,13 @@
                  function="ToggleControl"
                  parameter="DebugShowTextureInfo" />
             </menu_item_check>
+            <menu_item_call
+              label="VRAM usage per object"
+              name="VRAM usage per object">
+              <menu_item_call.on_click
+                function="Floater.Show"
+                parameter="vram_usage" />
+            </menu_item_call>
             <menu_item_check
              label="Show Avatar Render Info"
              name="Show Avatar Render Info">

From 0c5678814e39fb6f0146ee4126f4a370c076e60a Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 7 Jan 2015 13:23:22 +0100
Subject: [PATCH 223/229] FIRE-3234 / FIRE-3832: Add silent agent inventory
 offer actions to legacy accept messages & separate show <-> accept

This commit addresses several issues with inventory offers:

1. When enabling legacy accept messages, the notification now allows to perform
   silent actions without notifying the sender. This has been implemented only
   for legacy style accept messages, because the V3-way will notify the sender
   automatically if the offer is received, so that it doesn't make any sense to
   add this feature here.

2. Inventory offers from agents now allows to choose between either accepting
   the offer OR accepting and showing. This is independent from the ShowNewInventory
   debug setting ("Automatically show new notecards, textures, landmarks after
   accepting"). However, due to the way inventory offers from groups or inworld
   objects work, there is no separation and accepting offers from these sources
   will still either open automatically or not, depending on the ShowNewInventory
   setting.

3. The debug setting ShowOfferedInventory that was exposed nowhere and therefore
   always TRUE has been made obsolete. Since ShowOfferedInventory is tied to
   inventory offers from agents, there is no need for this setting anymore, as
   inventory offers from agents now show separate options for showing or just
   accepting. If an inventory offers is shown depends on either the user's
   choice per agent inventory offer or the ShowNewInventory debug setting.

4. Removed the check for ShowNewInventory in check_offer_throttle() as it will
   be called by open_inventory_offer(). Instead, check for ShowNewInventory
   before actually trying to open an inventory offer.

5. Fix the inventory panel still jumping to the new item despite the debug
   setting ShowInInventory has been set to FALSE. The new item will now only be
   shown in inventory, if ShowInInventory is TRUE. If the inventory panel is
   closed, it will be opened.
---
 indra/newview/llviewerinventory.cpp           | 12 +++-
 indra/newview/llviewermessage.cpp             | 72 +++++++++++++++----
 indra/newview/llviewermessage.h               |  7 +-
 .../skins/default/xui/da/notifications.xml    | 14 ++++
 .../skins/default/xui/de/notifications.xml    | 16 ++++-
 .../skins/default/xui/en/notifications.xml    | 46 ++++++++++++
 .../skins/default/xui/es/notifications.xml    | 14 ++++
 .../skins/default/xui/fr/notifications.xml    | 14 ++++
 .../skins/default/xui/it/notifications.xml    | 14 ++++
 .../skins/default/xui/ja/notifications.xml    | 14 ++++
 .../skins/default/xui/pl/notifications.xml    | 15 ++++
 .../skins/default/xui/pt/notifications.xml    | 14 ++++
 .../skins/default/xui/ru/notifications.xml    | 14 ++++
 .../skins/default/xui/tr/notifications.xml    | 14 ++++
 .../skins/default/xui/zh/notifications.xml    | 14 ++++
 15 files changed, 278 insertions(+), 16 deletions(-)

diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 6e8e10ed95..27b66fd9d6 100755
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -247,7 +247,17 @@ public:
 			uuid_vec_t items_to_open;
 			items_to_open.push_back(inventory_id);
 			//inventory_handler is just a stub, because we don't know from who this offer
-			open_inventory_offer(items_to_open, "inventory_handler");
+			// <FS:Ansariel> Moved check out of check_offer_throttle
+			//open_inventory_offer(items_to_open, "inventory_handler");
+			if (gSavedSettings.getBOOL("ShowNewInventory"))
+			{
+				open_inventory_offer(items_to_open, "inventory_handler");
+			}
+			else if (!items_to_open.empty() && gSavedSettings.getBOOL("ShowInInventory"))
+			{
+				LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, items_to_open.back());
+			}
+			// </FS:Ansariel>
 			return true;
 		}
 		
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 63c212980d..6cd12a30d2 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -853,6 +853,9 @@ public:
 	}
 	/*virtual*/ void done()
 	{
+		// <FS:Ansariel> FIRE-3234: Don't need a check for ShowNewInventory here;
+		// This only gets called if the user explicity clicks "Show" or
+		// AutoAcceptNewInventory and ShowNewInventory are TRUE.
 		open_inventory_offer(mComplete, mFromName);
 		gInventory.removeObserver(this);
 		delete this;
@@ -1089,7 +1092,17 @@ protected:
 			else ++it;
 		}
 
-		open_inventory_offer(mAdded, "");
+		// <FS:Ansariel> Moved check out of check_offer_throttle
+		//open_inventory_offer(mAdded, "");
+		if (gSavedSettings.getBOOL("ShowNewInventory"))
+		{
+			open_inventory_offer(mAdded, "");
+		}
+		else if (!mAdded.empty() && gSavedSettings.getBOOL("ShowInInventory"))
+		{
+			LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, mAdded.back());
+		}
+		// </FS:Ansariel>
 		mAdded.clear();
 	}
  };
@@ -1099,7 +1112,17 @@ class LLOpenTaskGroupOffer : public LLInventoryAddedObserver
 protected:
 	/*virtual*/ void done()
 	{
-		open_inventory_offer(mAdded, "group_offer");
+		// <FS:Ansariel> Moved check out of check_offer_throttle
+		//open_inventory_offer(mAdded, "group_offer");
+		if (gSavedSettings.getBOOL("ShowNewInventory"))
+		{
+			open_inventory_offer(mAdded, "group_offer");
+		}
+		else if (!mAdded.empty() && gSavedSettings.getBOOL("ShowInInventory"))
+		{
+			LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, mAdded.back());
+		}
+		// </FS:Ansariel>
 		mAdded.clear();
 		gInventory.removeObserver(this);
 		delete this;
@@ -1184,12 +1207,10 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
 	LLChat chat;
 	std::string log_message;
 
-	// <FS:PP> gSavedSettings to LLCachedControl
-	// if (!gSavedSettings.getBOOL("ShowNewInventory"))
-	static LLCachedControl<bool> showNewInventory(gSavedSettings, "ShowNewInventory");
-	if (!showNewInventory)
-	// </FS:PP>
-		return false;
+	// <FS:Ansariel> This controls if items should be opened in open_inventory_offer()??? No way!
+	//if (!gSavedSettings.getBOOL("ShowNewInventory"))
+	//	return false;
+	// </FS:Ansariel>
 
 	if (check_only)
 	{
@@ -1412,6 +1433,8 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
 		const BOOL auto_open = gSavedSettings.getBOOL("ShowInInventory"); // AO: don't open if showininventory is false, otherwise ignore from_name.
 			//gSavedSettings.getBOOL("ShowInInventory") && // don't open if showininventory is false
 			//!from_name.empty(); // don't open if it's not from anyone.
+		// <FS:Ansariel> Don't mess with open inventory panels when ShowInInventory is FALSE
+		if (auto_open)
 		LLInventoryPanel::openInventoryPanelAndSetSelection(auto_open, obj_id);
 	}
 }
@@ -1466,6 +1489,7 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
 		{
 			if(notification->getName() == "ObjectGiveItem" 
 				|| notification->getName() == "OwnObjectGiveItem"
+				|| notification->getName() == "UserGiveItemLegacy" // <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
 				|| notification->getName() == "UserGiveItem")
 			{
 				return (notification->getPayload()["from_id"].asUUID() == blocked_id);
@@ -1678,6 +1702,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 	switch(button)
 	{
 	case IOR_SHOW:
+	case IOR_SHOW_SILENT: // <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
 		// we will want to open this item when it comes back.
 		LL_DEBUGS("Messaging") << "Initializing an opener for tid: " << mTransactionID
 				 << LL_ENDL;
@@ -1700,7 +1725,10 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 				}
 // [/RLVa:KB]
 
-				if (gSavedSettings.getBOOL("ShowOfferedInventory"))
+				// <FS:Ansariel> FIRE-3234: Ask if items should be previewed;
+				// ShowOfferedInventory is always true anyway - instead there is
+				// ShowNewInventory that is actually changable by the user!
+				//if (gSavedSettings.getBOOL("ShowOfferedInventory"))
 				{
 					LLOpenAgentOffer* open_agent_offer = new LLOpenAgentOffer(mObjectID, from_string);
 					open_agent_offer->startFetch();
@@ -1715,7 +1743,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 				}
 
 				// <FS:Ansariel> Optional V1-like inventory accept messages
-				if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages"))
+				if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && button == IOR_SHOW)
 				{
 					send_auto_receive_response();
 				}
@@ -1746,6 +1774,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 		// end switch (mIM)
 			
 	case IOR_ACCEPT:
+	case IOR_ACCEPT_SILENT: // <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
 		//don't spam them if they are getting flooded
 		if (check_offer_throttle(mFromName, true))
 		{
@@ -1755,6 +1784,17 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 			LLNotificationsUtil::add("SystemMessageTip", args);
 		}
 
+		// <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
+		if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && button == IOR_ACCEPT)
+		{
+			send_auto_receive_response();
+		}
+		if (gSavedSettings.getBOOL("ShowInInventory"))
+		{
+			LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, mObjectID);
+		}
+		// </FS:Ansariel>
+
 		break;
 
 	case IOR_MUTE:
@@ -1764,6 +1804,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 		}
 		// MUTE falls through to decline
 	case IOR_DECLINE:
+	case IOR_DECLINE_SILENT: // <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
 		{
 			{
 				LLStringUtil::format_map_t log_message_args;
@@ -1793,7 +1834,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 			}
 
 			// <FS:Ansariel> Optional V1-like inventory accept messages
-			if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages"))
+			if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && button == IOR_DECLINE)
 			{
 				send_decline_response();
 			}
@@ -2086,6 +2127,8 @@ void LLOfferInfo::initRespondFunctionMap()
 		mRespondFunctions["ObjectGiveItem"] = boost::bind(&LLOfferInfo::inventory_task_offer_callback, this, _1, _2);
 		mRespondFunctions["OwnObjectGiveItem"] = boost::bind(&LLOfferInfo::inventory_task_offer_callback, this, _1, _2);
 		mRespondFunctions["UserGiveItem"] = boost::bind(&LLOfferInfo::inventory_offer_callback, this, _1, _2);
+		// <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
+		mRespondFunctions["UserGiveItemLegacy"] = boost::bind(&LLOfferInfo::inventory_offer_callback, this, _1, _2);
 	}
 }
 
@@ -2233,7 +2276,10 @@ void inventory_offer_handler(LLOfferInfo* info)
 		// closes viewer(without responding the notification)
 		p.substitutions(args).payload(payload).functor.responder(LLNotificationResponderPtr(info));
 		info->mPersist = true;
-		p.name = "UserGiveItem";
+		// <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
+		//p.name = "UserGiveItem";
+		p.name = (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") ? "UserGiveItemLegacy" : "UserGiveItem");
+		// </FS:Ansariel>
 		p.offer_from_agent = true;
 		
 		// Prefetch the item into your local inventory.
@@ -2272,7 +2318,7 @@ void inventory_offer_handler(LLOfferInfo* info)
 		}
 
 		// <FS:Ansariel> Show offered inventory also if auto-accept is enabled (FIRE-5101)
-		if (bAutoAccept && gSavedSettings.getBOOL("ShowOfferedInventory"))
+		if (bAutoAccept && gSavedSettings.getBOOL("ShowNewInventory"))
 		{
 			LLViewerInventoryCategory* catp = NULL;
 			catp = (LLViewerInventoryCategory*)gInventory.getCategory(info->mObjectID);
diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h
index 719c10b42f..680d4b13e8 100755
--- a/indra/newview/llviewermessage.h
+++ b/indra/newview/llviewermessage.h
@@ -60,7 +60,12 @@ enum InventoryOfferResponse
 	IOR_ACCEPT,
 	IOR_DECLINE,
 	IOR_MUTE,
-	IOR_SHOW
+	IOR_SHOW,
+	// <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
+	IOR_ACCEPT_SILENT,
+	IOR_DECLINE_SILENT,
+	IOR_SHOW_SILENT
+	// </FS:Ansariel>
 };
 
 BOOL can_afford_transaction(S32 cost);
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index 72817c6106..f231420431 100755
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -1346,10 +1346,24 @@ Prøv igen om lidt.
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Show" text="Vis"/>
+			<button name="Keep" text="Behold"/>
 			<button name="Discard" text="Smid væk"/>
 			<button name="Mute" text="Blokér"/>
 		</form>
 	</notification>
+	<notification name="UserGiveItemLegacy">
+		[NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]:
+[ITEM_SLURL]
+		<form name="form">
+			<button name="Show" text="Vis"/>
+			<button name="Accept" text="Behold"/>
+			<button name="Discard" text="Smid væk"/>
+			<button name="ShowSilent" text="(Vis)"/>
+			<button name="AcceptSilent" text="(Behold)"/>
+			<button name="DiscardSilent" text="(Smid væk)"/>
+			<button name="Mute" text="Blokér"/>
+		</form>
+	</notification>
 	<notification name="GodMessage">
 		[NAME]
 
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 9157f2269e..3a7f21ddd9 100755
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -2800,11 +2800,25 @@ Versuchen Sie es in einigen Minuten erneut.
 		[NAME_SLURL] hat Ihnen folgendes [OBJECTTYPE] übergeben:
 [ITEM_SLURL]
 		<form name="form">
-			<button name="Show" text="Annehmen"/>
+			<button name="Show" text="Anzeigen"/>
+			<button name="Keep" text="Annehmen"/>
 			<button name="Discard" text="Verwerfen"/>
 			<button name="Mute" text="Blockieren"/>
 		</form>
 	</notification>
+	<notification name="UserGiveItemLegacy">
+		[NAME_SLURL] hat Ihnen folgendes [OBJECTTYPE] übergeben:
+[ITEM_SLURL]
+		<form name="form">
+			<button name="Show" text="Anzeigen"/>
+			<button name="Accept" text="Annehmen"/>
+			<button name="Discard" text="Verwerfen"/>
+			<button name="ShowSilent" text="(Anzeigen)"/>
+			<button name="AcceptSilent" text="(Annehmen)"/>
+			<button name="DiscardSilent" text="(Verwerfen)"/>
+			<button name="Mute" text="Blockieren"/>
+		</form>
+	</notification>
 	<notification name="GodMessage">
 		[NAME]
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ceb2bbd549..66ad9262b8 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7194,6 +7194,10 @@ Do you want to keep it? "Mute" will block all future offers or messages from [NA
       <button
        index="3"
        name="Show"
+       text="Show"/>
+      <button
+       index="0"
+       name="Keep"
        text="Accept"/>
       <button
        index="1"
@@ -7206,6 +7210,48 @@ Do you want to keep it? "Mute" will block all future offers or messages from [NA
     </form>
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="UserGiveItemLegacy"
+   label="Inventory offer from [NAME_LABEL]"
+   log_to_im ="true"
+   type="offer"
+   sound="UISndInventoryOffer">
+[NAME_SLURL] has given you this [OBJECTTYPE]:
+[ITEM_SLURL]
+Do you want to keep it? "Mute" will block all future offers or messages from [NAME_SLURL].
+    <form name="form">
+      <button
+       index="3"
+       name="Show"
+       text="Show"/>
+      <button
+       index="0"
+       name="Accept"
+       text="Accept"/>
+      <button
+       index="1"
+       name="Discard"
+       text="Discard"/>
+      <button
+       index="6"
+       name="ShowSilent"
+       text="(Show)"/>
+      <button
+       index="4"
+       name="AcceptSilent"
+       text="(Accept)"/>
+      <button
+       index="5"
+       name="DiscardSilent"
+       text="(Discard)"/>
+      <button
+       index="2"
+       name="Mute"
+       text="Mute Sender"/>
+    </form>
+  </notification>
+
   <notification
    icon="notify.tga"
    name="GodMessage"
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 9c9a4f3228..946458fbcf 100755
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -2907,10 +2907,24 @@ Por favor, vuelve a intentarlo en unos momentos.
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Show" text="Mostrar"/>
+			<button name="Keep" text="Guardar"/>
 			<button name="Discard" text="Descartar"/>
 			<button name="Mute" text="Bloquear"/>
 		</form>
 	</notification>
+	<notification name="UserGiveItemLegacy">
+		[NAME_SLURL] te ha dado este [OBJECTTYPE]:
+[ITEM_SLURL]
+		<form name="form">
+			<button name="Show" text="Mostrar"/>
+			<button name="Accept" text="Guardar"/>
+			<button name="Discard" text="Descartar"/>
+			<button name="ShowSilent" text="(Mostrar)"/>
+			<button name="AcceptSilent" text="(Guardar)"/>
+			<button name="DiscardSilent" text="(Descartar)"/>
+			<button name="Mute" text="Bloquear"/>
+		</form>
+	</notification>
 	<notification name="GodMessage">
 		[NAME]
 
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 1b2793fb45..3f50853114 100755
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -2664,10 +2664,24 @@ Veuillez réessayer dans quelques minutes.
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Show" text="Afficher"/>
+			<button name="Keep" text="Garder"/>
 			<button name="Discard" text="Jeter"/>
 			<button name="Mute" text="Ignorer"/>
 		</form>
 	</notification>
+	<notification name="UserGiveItemLegacy">
+		[NAME_SLURL] vous a donné un [OBJECTTYPE] :
+[ITEM_SLURL]
+		<form name="form">
+			<button name="Show" text="Afficher"/>
+			<button name="Accept" text="Garder"/>
+			<button name="Discard" text="Jeter"/>
+			<button name="ShowSilent" text="(Afficher)"/>
+			<button name="AcceptSilent" text="(Garder)"/>
+			<button name="DiscardSilent" text="(Jeter)"/>
+			<button name="Mute" text="Ignorer"/>
+		</form>
+	</notification>
 	<notification name="GodMessage">
 		[NAME]
 
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 17a23cd86f..c7fb23d5d9 100755
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -2670,10 +2670,24 @@ Riprova tra qualche istante.
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Show" text="Mostra"/>
+			<button name="Keep" text="Mantieni"/>
 			<button name="Discard" text="Rifiuta"/>
 			<button name="Mute" text="Blocca"/>
 		</form>
 	</notification>
+	<notification name="UserGiveItemLegacy">
+		[NAME_SLURL] ti ha dato questo [OBJECTTYPE]:
+[ITEM_SLURL]
+		<form name="form">
+			<button name="Show" text="Mostra"/>
+			<button name="Accept" text="Mantieni"/>
+			<button name="Discard" text="Rifiuta"/>
+			<button name="ShowSilent" text="(Mostra)"/>
+			<button name="AcceptSilent" text="(Mantieni)"/>
+			<button name="DiscardSilent" text="(Rifiuta)"/>
+			<button name="Mute" text="Blocca"/>
+		</form>
+	</notification>
 	<notification name="GodMessage">
 		[NAME]
 
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 4745c40a8b..cabc1c8444 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -2742,10 +2742,24 @@ URL: [AUDIOURL]
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Show" text="表示"/>
+			<button name="Keep" text="キープ"/>
 			<button name="Discard" text="破棄"/>
 			<button name="Mute" text="ブロック"/>
 		</form>
 	</notification>
+	<notification name="UserGiveItemLegacy">
+		[NAME_SLURL] があなたに [OBJECTTYPE] を渡しました：
+[ITEM_SLURL]
+		<form name="form">
+			<button name="Show" text="表示"/>
+			<button name="Accept" text="キープ"/>
+			<button name="Discard" text="破棄"/>
+			<button name="ShowSilent" text="（表示）"/>
+			<button name="AcceptSilent" text="キープ"/>
+			<button name="DiscardSilent" text="破棄"/>
+			<button name="Mute" text="ブロック"/>
+		</form>
+	</notification>
 	<notification name="GodMessage">
 		[NAME]
 
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 806b17d53b..880bafdb4b 100755
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -2724,10 +2724,25 @@ Spróbuj ponownie za kilka minut.
 Chcesz zachować ten obiekt? Wybranie "Zablokuj" sprawi, że nie będziesz już otrzymywać żadnych ofert lub wiadomości od [NAME_SLURL].
 		<form name="form">
 			<button name="Show" text="Pokaż"/>
+			<button name="Keep" text="Zachowaj"/>
 			<button name="Discard" text="Wyrzuć"/>
 			<button name="Mute" text="Zablokuj"/>
 		</form>
 	</notification>
+	<notification name="UserGiveItemLegacy" label="Propozycja przedmiotu od [NAME_LABEL]">
+		[NAME_SLURL] dał Ci [OBJECTTYPE]:
+[ITEM_SLURL]
+Chcesz zachować ten obiekt? Wybranie "Zablokuj" sprawi, że nie będziesz już otrzymywać żadnych ofert lub wiadomości od [NAME_SLURL].
+		<form name="form">
+			<button name="Show" text="Pokaż"/>
+			<button name="Accept" text="Zachowaj"/>
+			<button name="Discard" text="Verwerfen"/>
+			<button name="ShowSilent" text="(Wyrzuć)"/>
+			<button name="AcceptSilent" text="(Zachowaj)"/>
+			<button name="DiscardSilent" text="(Wyrzuć)"/>
+			<button name="Mute" text="Zablokuj"/>
+		</form>
+	</notification>
 	<notification name="JoinGroup">
 		[MESSAGE]
 		<form name="form">
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 1a50c977cd..f1e150e47c 100755
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -2654,10 +2654,24 @@ Por favor, tente novamente em alguns instantes.
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Show" text="Mostrar"/>
+			<button name="Keep" text="Manter"/>
 			<button name="Discard" text="Descarte"/>
 			<button name="Mute" text="Bloquear"/>
 		</form>
 	</notification>
+	<notification name="UserGiveItemLegacy">
+		[NAME_SLURL] lhe deu [OBJECTTYPE]:
+[ITEM_SLURL]
+		<form name="form">
+			<button name="Show" text="Mostrar"/>
+			<button name="Accept" text="Manter"/>
+			<button name="Discard" text="Verwerfen"/>
+			<button name="ShowSilent" text="(Descarte)"/>
+			<button name="AcceptSilent" text="(Manter)"/>
+			<button name="DiscardSilent" text="(Descarte)"/>
+			<button name="Mute" text="Bloquear"/>
+		</form>
+	</notification>
 	<notification name="GodMessage">
 		[NAME]
 
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index a95102c1a8..d45a844fc1 100755
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -2664,10 +2664,24 @@ http://secondlife.com/download.
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Show" text="Показать"/>
+			<button name="Keep" text="Оставить"/>
 			<button name="Discard" text="Удалить"/>
 			<button name="Mute" text="Заблокировать"/>
 		</form>
 	</notification>
+	<notification name="UserGiveItemLegacy">
+		[NAME_SLURL] дал(а) вам этот [OBJECTTYPE]:
+[ITEM_SLURL]
+		<form name="form">
+			<button name="Show" text="Показать"/>
+			<button name="Accept" text="Оставить"/>
+			<button name="Discard" text="Удалить"/>
+			<button name="ShowSilent" text="(Показать)"/>
+			<button name="AcceptSilent" text="(Оставить)"/>
+			<button name="DiscardSilent" text="(Удалить)"/>
+			<button name="Mute" text="Заблокировать"/>
+		</form>
+	</notification>
 	<notification name="GodMessage">
 		[NAME]
 
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index 9d6906cb4e..3fffd5ebe3 100755
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -2664,10 +2664,24 @@ Lütfen biraz sonra tekrar deneyin.
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Show" text="Göster"/>
+			<button name="Keep" text="Sakla"/>
 			<button name="Discard" text="At"/>
 			<button name="Mute" text="Engelle"/>
 		</form>
 	</notification>
+	<notification name="UserGiveItemLegacy">
+		[NAME_SLURL] size [OBJECTTYPE] türündeki nesneyi verdi:
+[ITEM_SLURL]
+		<form name="form">
+			<button name="Show" text="Göster"/>
+			<button name="Accept" text="Sakla"/>
+			<button name="Discard" text="At"/>
+			<button name="ShowSilent" text="(Göster)"/>
+			<button name="AcceptSilent" text="(Sakla)"/>
+			<button name="DiscardSilent" text="(At)"/>
+			<button name="Mute" text="Engelle"/>
+		</form>
+	</notification>
 	<notification name="GodMessage">
 		[NAME]
 
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 3a0a38194f..d22c0c54ea 100755
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -2654,10 +2654,24 @@ SHA1 指紋：[MD5_DIGEST]
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Show" text="顯示"/>
+			<button name="Keep" text="保留"/>
 			<button name="Discard" text="丟棄"/>
 			<button name="Mute" text="封鎖"/>
 		</form>
 	</notification>
+	<notification name="UserGiveItemLegacy">
+		[NAME_SLURL] 給了你這個 [OBJECTTYPE]：
+[ITEM_SLURL]
+		<form name="form">
+			<button name="Show" text="顯示"/>
+			<button name="Accept" text="保留"/>
+			<button name="Discard" text="丟棄"/>
+			<button name="ShowSilent" text="（顯示）"/>
+			<button name="AcceptSilent" text="（保留）"/>
+			<button name="DiscardSilent" text="（丟棄）"/>
+			<button name="Mute" text="封鎖"/>
+		</form>
+	</notification>
 	<notification name="GodMessage">
 		[NAME]
 

From 488f737fdff6680455917a451952b6f487b8db67 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 7 Jan 2015 14:10:10 +0100
Subject: [PATCH 224/229] Rename fs_floater_vram_usage.xml to
 floater_fs_vram_usage.xml so it can actually be previewed in the XUI preview
 tool

---
 indra/newview/llviewerfloaterreg.cpp                        | 6 ++----
 ...{fs_floater_vram_usage.xml => floater_fs_vram_usage.xml} | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename indra/newview/skins/default/xui/en/{fs_floater_vram_usage.xml => floater_fs_vram_usage.xml} (95%)

diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 47d7e658cc..dcda17b211 100755
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -176,6 +176,7 @@
 #include "fsfloaterteleporthistory.h"
 #include "fsfloatervoicecontrols.h"
 #include "fsfloatervolumecontrols.h"
+#include "fsfloatervramusage.h"
 #include "fsfloaterwsassetblacklist.h"
 #include "fsmoneytracker.h"
 #include "fspanelclassified.h"
@@ -188,8 +189,6 @@
 #include "particleeditor.h"
 #include "quickprefs.h"
 
-#include "fsfloatervramusage.h"
-
 // handle secondlife:///app/openfloater/{NAME} URLs
 class LLFloaterOpenHandler : public LLCommandHandler
 {
@@ -428,9 +427,8 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("secondary_inventory", "floater_my_inventory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
 	LLFloaterReg::add("script_recover", "floater_script_recover.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterScriptRecover>);
 	LLFloaterReg::add("sound_explorer", "floater_NACL_explore_sounds.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<NACLFloaterExploreSounds>);
+	LLFloaterReg::add( "vram_usage", "floater_fs_vram_usage.xml", static_cast<LLFloaterBuildFunc>( &LLFloaterReg::build< FSFloaterVRAMUsage >) );
 	LLFloaterReg::add("ws_asset_blacklist", "floater_asset_blacklist.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterWSAssetBlacklist>);
 
-	LLFloaterReg::add( "vram_usage", "fs_floater_vram_usage.xml", static_cast<LLFloaterBuildFunc>( &LLFloaterReg::build< FSFloaterVRAMUsage >) );
-
 	LLFloaterReg::registerControlVariables(); // Make sure visibility and rect controls get preserved when saving
 }
diff --git a/indra/newview/skins/default/xui/en/fs_floater_vram_usage.xml b/indra/newview/skins/default/xui/en/floater_fs_vram_usage.xml
similarity index 95%
rename from indra/newview/skins/default/xui/en/fs_floater_vram_usage.xml
rename to indra/newview/skins/default/xui/en/floater_fs_vram_usage.xml
index 63179d7aa6..99fb0cbd21 100644
--- a/indra/newview/skins/default/xui/en/fs_floater_vram_usage.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_vram_usage.xml
@@ -51,11 +51,11 @@
           dynamicwidth="true"/>
       <column
           name="vram_usage"
-          label="VRAM (Textures) in kb"
+          label="VRAM (Textures) in KB"
           dynamicwidth="true"/>
       <column
           name="vram_usage_vbo"
-          label="VRAM (VBO) in kb"
+          label="VRAM (VBO) in KB"
           dynamicwidth="true"/>
     </scroll_list>
     <button

From e0f29af442074af40c6756ff5a5cf11f1a532605 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 7 Jan 2015 14:13:03 +0100
Subject: [PATCH 225/229] Updated German translation

---
 .../skins/default/xui/de/floater_fs_vram_usage.xml | 14 ++++++++++++++
 indra/newview/skins/default/xui/de/menu_viewer.xml |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/de/floater_fs_vram_usage.xml

diff --git a/indra/newview/skins/default/xui/de/floater_fs_vram_usage.xml b/indra/newview/skins/default/xui/de/floater_fs_vram_usage.xml
new file mode 100644
index 0000000000..091872963a
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_fs_vram_usage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="object_vram_usage" title="Objektauswirkung auf VRAM">
+	<scroll_list name="result_list">
+		<column name="uuid" label="UUID"/>
+		<column name="name" label="Name"/>
+		<column name="distance" label="Entfernung"/>
+		<column name="faces" label="Flächen"/>
+		<column name="vertices" label="Vertices"/>
+		<column name="indices" label="Indizes"/>
+		<column name="vram_usage" label="VRAM (Texturen) in KB"/>
+		<column name="vram_usage_vbo" label="VRAM (VBO) in KB"/>
+	</scroll_list>
+	<button label="Aktualisieren" label_selected="Aktualisieren" name="refresh_button"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 69378838bf..7ed98d96f4 100755
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -387,6 +387,7 @@
 			<menu_item_check label="Transaktion beim Hochladen anzeigen" name="Show Upload Transaction"/>
 			<menu_item_check label="Render-Info anzeigen" name="Show Render Info"/>
 			<menu_item_check label="Texturinfos anzeigen" name="Show Texture Info"/>
+			<menu_item_call label="VRAM-Belegung pro Objekt" name="VRAM usage per object"/>
 			<menu_item_check label="Matrizen anzeigen" name="Show Matrices"/>
 			<menu_item_check label="Farbe unter Cursor anzeigen" name="Show Color Under Cursor"/>
 			<menu_item_check label="Speicher anzeigen" name="Show Memory"/>

From 27d75d6a62f83fe96ccc3f36da45041613dde3cd Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 7 Jan 2015 14:30:53 +0100
Subject: [PATCH 226/229] FIRE-15342: Avatar icons are shown in V3 chat history
 under RLVa ShowNames restriction

---
 indra/newview/fschathistory.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp
index 9f08bc3cc2..d1752da561 100644
--- a/indra/newview/fschathistory.cpp
+++ b/indra/newview/fschathistory.cpp
@@ -506,7 +506,14 @@ public:
 		switch (mSourceType)
 		{
 			case CHAT_SOURCE_AGENT:
-				icon->setValue(chat.mFromID);
+				if (!chat.mRlvNamesFiltered)
+				{
+					icon->setValue(chat.mFromID);
+				}
+				else
+				{
+					icon->setValue(LLSD("Unknown_Icon"));
+				}
 				break;
 			case CHAT_SOURCE_OBJECT:
 				icon->setValue(LLSD("OBJECT_Icon"));
@@ -516,7 +523,14 @@ public:
 				// FS:LO FIRE-1439 - Clickable avatar names on local chat radar crossing reports
 				if(chat.mChatType == CHAT_TYPE_RADAR)
 				{
-					icon->setValue(chat.mFromID);
+					if (!chat.mRlvNamesFiltered)
+					{
+						icon->setValue(chat.mFromID);
+					}
+					else
+					{
+						icon->setValue(LLSD("Unknown_Icon"));
+					}
 				}
 				else
 				{

From 58d6562e600b05cb6f90cc4d2010a5025aff16f9 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 7 Jan 2015 16:51:27 +0100
Subject: [PATCH 227/229] Blocklist sometimes shows "(waiting)" as avatar name
 when blocking particle owners

---
 indra/newview/llviewermenu.cpp | 43 ++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 6d707d0b2f..5618693f73 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -7686,25 +7686,44 @@ class LLLandEdit : public view_listener_t
 
 class LLMuteParticle : public view_listener_t
 {
+	// <FS:Ansariel> Blocklist sometimes shows "(waiting)" as avatar name when blocking particle owners
+	void onAvatarNameCache(const LLUUID& av_id, const LLAvatarName& av_name)
+	{
+		LLMute mute(av_id, av_name.getLegacyName(), LLMute::AGENT);
+		if (LLMuteList::getInstance()->isMuted(mute.mID))
+		{
+			LLMuteList::getInstance()->remove(mute);
+		}
+		else
+		{
+			LLMuteList::getInstance()->add(mute);
+			LLPanelBlockedList::showPanelAndSelect(mute.mID);
+		}
+	}
+	// </FS:Ansariel>
+
 	bool handleEvent(const LLSD& userdata)
 	{
 		LLUUID id = LLToolPie::getInstance()->getPick().mParticleOwnerID;
 		
 		if (id.notNull())
 		{
-			std::string name;
-			gCacheName->getFullName(id, name);
+			// <FS:Ansariel> Blocklist sometimes shows "(waiting)" as avatar name when blocking particle owners
+			//std::string name;
+			//gCacheName->getFullName(id, name);
 
-			LLMute mute(id, name, LLMute::AGENT);
-			if (LLMuteList::getInstance()->isMuted(mute.mID))
-			{
-				LLMuteList::getInstance()->remove(mute);
-			}
-			else
-			{
-				LLMuteList::getInstance()->add(mute);
-				LLPanelBlockedList::showPanelAndSelect(mute.mID);
-			}
+			//LLMute mute(id, name, LLMute::AGENT);
+			//if (LLMuteList::getInstance()->isMuted(mute.mID))
+			//{
+			//	LLMuteList::getInstance()->remove(mute);
+			//}
+			//else
+			//{
+			//	LLMuteList::getInstance()->add(mute);
+			//	LLPanelBlockedList::showPanelAndSelect(mute.mID);
+			//}
+			LLAvatarNameCache::get(id, boost::bind(&LLMuteParticle::onAvatarNameCache, this, _1, _2));
+			// </FS:Ansariel>
 		}
 
 		return true;

From 01e62e7336b894c717cf4d35cae291dd38fbecaa Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 8 Jan 2015 22:10:02 +0100
Subject: [PATCH 228/229] Fix action on inventory offers when forcing a respond
 without user action

---
 indra/newview/llviewermessage.cpp             | 31 +++++++++++++++++--
 .../skins/default/xui/en/notifications.xml    |  1 +
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 6cd12a30d2..e7d9127584 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -9315,8 +9315,35 @@ void invalid_message_callback(LLMessageSystem* msg,
 
 void LLOfferInfo::forceResponse(InventoryOfferResponse response)
 {
-	LLNotification::Params params("UserGiveItem");
+	// <FS:Ansariel> Now this is a hell of piece of... forceResponse() will look for the
+	//               ELEMENT index, and NOT the button index. So if we want to force a
+	//               response of IOR_ACCEPT, we need to pass the correct element
+	//               index of the button. Since we have modified the button order and also
+	//               added legacy accept/decline messages support, we want to reponse with
+	//               the silent version. So we don't use UserGiveItem but UserGiveItemLegacy
+	//               and map the button index to the correct element index.
+	//LLNotification::Params params("UserGiveItem");
+	//params.functor.function(boost::bind(&LLOfferInfo::inventory_offer_callback, this, _1, _2));
+	//LLNotifications::instance().forceResponse(params, response);
+	S32 element_index;
+	switch (response)
+	{
+		case IOR_ACCEPT:
+			element_index = 4;
+			break;
+		case IOR_DECLINE:
+			element_index = 5;
+			break;
+		case IOR_MUTE:
+			element_index = 6;
+			break;
+		default:
+			element_index = -1;
+			break;
+	}
+	LLNotification::Params params("UserGiveItemLegacy");
 	params.functor.function(boost::bind(&LLOfferInfo::inventory_offer_callback, this, _1, _2));
-	LLNotifications::instance().forceResponse(params, response);
+	LLNotifications::instance().forceResponse(params, element_index);
+	// </FS:Ansariel>
 }
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 66ad9262b8..63039ef1ec 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7210,6 +7210,7 @@ Do you want to keep it? "Mute" will block all future offers or messages from [NA
     </form>
   </notification>
 
+  <!-- FS:Ansariel: WARNING: Read LLOfferInfo::forceResponse in llviewermessage.cpp before changing the button order!!! -->
   <notification
    icon="notify.tga"
    name="UserGiveItemLegacy"

From 24ed25883df8e0b7b102dc4cfc997b1c8445c4d4 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 8 Jan 2015 22:58:19 +0100
Subject: [PATCH 229/229] More hacking on the group notice attachments - Who at
 LL had the idea to route IOR_ACCEPT through IOR_SHOW???

---
 indra/newview/llviewermessage.cpp             | 29 +++++++++++--------
 .../skins/default/xui/en/notifications.xml    |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index e7d9127584..ed2a0c65e0 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1785,13 +1785,21 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 		}
 
 		// <FS:Ansariel> FIRE-3832: Silent accept/decline of inventory offers
-		if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && button == IOR_ACCEPT)
+		if (mIM == IM_GROUP_NOTICE)
 		{
+			opener = new LLOpenTaskGroupOffer;
 			send_auto_receive_response();
 		}
-		if (gSavedSettings.getBOOL("ShowInInventory"))
+		else
 		{
-			LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, mObjectID);
+			if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && button == IOR_ACCEPT)
+			{
+				send_auto_receive_response();
+			}
+			if (gSavedSettings.getBOOL("ShowInInventory"))
+			{
+				LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, mObjectID);
+			}
 		}
 		// </FS:Ansariel>
 
@@ -1834,7 +1842,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 			}
 
 			// <FS:Ansariel> Optional V1-like inventory accept messages
-			if (gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && button == IOR_DECLINE)
+			if ((gSavedSettings.getBOOL("FSUseLegacyInventoryAcceptMessages") && button == IOR_DECLINE) && mIM == IM_INVENTORY_OFFERED)
 			{
 				send_decline_response();
 			}
@@ -9318,10 +9326,7 @@ void LLOfferInfo::forceResponse(InventoryOfferResponse response)
 	// <FS:Ansariel> Now this is a hell of piece of... forceResponse() will look for the
 	//               ELEMENT index, and NOT the button index. So if we want to force a
 	//               response of IOR_ACCEPT, we need to pass the correct element
-	//               index of the button. Since we have modified the button order and also
-	//               added legacy accept/decline messages support, we want to reponse with
-	//               the silent version. So we don't use UserGiveItem but UserGiveItemLegacy
-	//               and map the button index to the correct element index.
+	//               index of the button.
 	//LLNotification::Params params("UserGiveItem");
 	//params.functor.function(boost::bind(&LLOfferInfo::inventory_offer_callback, this, _1, _2));
 	//LLNotifications::instance().forceResponse(params, response);
@@ -9329,19 +9334,19 @@ void LLOfferInfo::forceResponse(InventoryOfferResponse response)
 	switch (response)
 	{
 		case IOR_ACCEPT:
-			element_index = 4;
+			element_index = 1;
 			break;
 		case IOR_DECLINE:
-			element_index = 5;
+			element_index = 2;
 			break;
 		case IOR_MUTE:
-			element_index = 6;
+			element_index = 3;
 			break;
 		default:
 			element_index = -1;
 			break;
 	}
-	LLNotification::Params params("UserGiveItemLegacy");
+	LLNotification::Params params("UserGiveItem");
 	params.functor.function(boost::bind(&LLOfferInfo::inventory_offer_callback, this, _1, _2));
 	LLNotifications::instance().forceResponse(params, element_index);
 	// </FS:Ansariel>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 63039ef1ec..62eb14b29d 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7180,6 +7180,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
     </form>
   </notification>
 
+  <!-- FS:Ansariel: WARNING: Read LLOfferInfo::forceResponse in llviewermessage.cpp before changing the button order!!! -->
   <notification
    icon="notify.tga"
    name="UserGiveItem"
@@ -7210,7 +7211,6 @@ Do you want to keep it? "Mute" will block all future offers or messages from [NA
     </form>
   </notification>
 
-  <!-- FS:Ansariel: WARNING: Read LLOfferInfo::forceResponse in llviewermessage.cpp before changing the button order!!! -->
   <notification
    icon="notify.tga"
    name="UserGiveItemLegacy"