From 9b01e5b57cabe61d373b0314a70805c766cc4e4a Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Tue, 15 Nov 2016 13:07:55 +0100
Subject: [PATCH 1/3] 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 4c495ccda2..1bedb2f5c8 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -131,6 +131,7 @@
 		<menu_item_call label="Eksplorator animacji" name="Animation Explorer"/>
 		<menu_item_call label="Czarna lista zasobów danych (assetów)" name="asset_blacklist"/>
 		<menu_item_call label="Ustawienia renderowania awatarów" name="Avatar Render Settings"/>
+		<menu_item_check label="Renderuj tylko znajomych" name="Render Friends Only"/>
 	</menu>
 	<menu label="Buduj" name="BuildTools">
 		<menu_item_check label="Pokaż narzędzia budowania" name="Show Build Tools"/>

From 27a8126dca588e1a6d13af4105ef73168f3fa5c2 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 15 Nov 2016 14:28:20 +0100
Subject: [PATCH 2/3] Enabling LLLineEditor via XUI breaks enabled-state -
 correct fix

setEnabled intentionally doesn't disable, but is a read-only flag. Make sure
the LLLineEditor is always enabled (calling the base-constructor will disabled it!)
 and then call the overloaded setEnabled-Method to apply the read-only flag
---
 indra/llui/lllineeditor.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 51ec9c256b..559be2503f 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -166,6 +166,11 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
 {
 	llassert( mMaxLengthBytes > 0 );
 
+	// <FS:Ansariel> Enabling LLLineEditor via XUI breaks enabled-state
+	LLUICtrl::setEnabled(TRUE);
+	setEnabled(p.enabled);
+	// </FS:Ansariel>
+
 	mScrollTimer.reset();
 	mTripleClickTimer.reset();
 	setText(p.default_text());
@@ -352,7 +357,6 @@ void LLLineEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
 
 void LLLineEditor::setEnabled(BOOL enabled)
 {
-	LLUICtrl::setEnabled(enabled); // <FS:Ansariel> Enabling LLLineEditor via XUI breaks enabled-state
 	mReadOnly = !enabled;
 	setTabStop(!mReadOnly);
 	updateAllowingLanguageInput();

From 892c20ac8cdbc68dc998058bf0a0a04765971635 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 15 Nov 2016 14:29:47 +0100
Subject: [PATCH 3/3] Backed out changeset 7711e2132299 - not needed anymore

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

diff --git a/indra/newview/fsdroptarget.h b/indra/newview/fsdroptarget.h
index 8d05993818..fed140d0ee 100644
--- a/indra/newview/fsdroptarget.h
+++ b/indra/newview/fsdroptarget.h
@@ -55,7 +55,7 @@ public:
 
 	virtual BOOL postBuild()
 	{
-		mReadOnly = TRUE;
+		setEnabled(FALSE);
 		return LLLineEditor::postBuild();
 	}
 
@@ -91,7 +91,7 @@ public:
 
 	virtual BOOL postBuild()
 	{
-		mReadOnly = TRUE;
+		setEnabled(FALSE);
 		return LLLineEditor::postBuild();
 	}