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();
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();
 	}
 
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"/>