diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 4abad087ff..51e9fa6283 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -12330,6 +12330,52 @@ class FSCheckCameraFloater : public view_listener_t
 };
 // <FS:Ansariel>
 
+// <FS:Ansariel> Add avater complexity sttings to menu
+class FSRenderAvatarComplexityMode : public view_listener_t
+{
+    bool handleEvent(const LLSD& userdata)
+    {
+        std::string param = userdata.asString();
+        if (param == "everyone")
+        {
+            gSavedSettings.setS32("RenderAvatarComplexityMode", 0);
+        }
+        else if (param == "always_friends")
+        {
+            gSavedSettings.setS32("RenderAvatarComplexityMode", 1);
+        }
+        else if (param == "only_friends")
+        {
+            gSavedSettings.setS32("RenderAvatarComplexityMode", 2);
+        }
+
+        return true;
+    }
+};
+
+class FSCheckRenderAvatarComplexityMode : public view_listener_t
+{
+    bool handleEvent(const LLSD& userdata)
+    {
+        std::string param = userdata.asString();
+        if (param == "everyone")
+        {
+            return gSavedSettings.getS32("RenderAvatarComplexityMode") == 0;
+        }
+        else if (param == "always_friends")
+        {
+            return gSavedSettings.getS32("RenderAvatarComplexityMode") == 1;
+        }
+        else if (param == "only_friends")
+        {
+            return gSavedSettings.getS32("RenderAvatarComplexityMode") == 2;
+        }
+
+        return true;
+    }
+};
+// <FS:Ansariel>
+
 void initialize_menus()
 {
     // A parameterized event handler used as ctrl-8/9/0 zoom controls below.
@@ -12988,4 +13034,8 @@ void initialize_menus()
     view_listener_t::addMenu(new FSObjectExportCollada(), "Object.ExportCollada");
     enable.add("Object.EnableExport", boost::bind(&enable_export_object));
     // </FS:Techwolf Lupindo>
+
+    // <FS:Ansariel> Add avater complexity sttings to menu
+    view_listener_t::addMenu(new FSRenderAvatarComplexityMode(), "World.RenderAvatarComplexityMode");
+    view_listener_t::addMenu(new FSCheckRenderAvatarComplexityMode(), "World.CheckRenderAvatarComplexityMode");
 }
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index bafcebb6d0..e4292dc84a 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -168,6 +168,11 @@
 		<menu_item_call label="Animation-Explorer" name="Animation Explorer"/>
 		<menu_item_call label="Asset-Blacklist" name="asset_blacklist"/>
 		<menu_item_call label="Avatar-Anzeigeeinstellungen" name="Avatar Render Settings"/>
+		<menu label="Avatar-Anzeige" name="AvatarComplexityMode">
+			<menu_item_check label="Komplexitätsbegrenzung" name="complexity_limit_everone"/>
+			<menu_item_check label="Freunde immer anzeigen" name="complexity_always_show_friends"/>
+			<menu_item_check label="Nur Freunde anzeigen" name="complexity_only_show_friends"/>
+		</menu>
 		<menu_item_check label="Nur Freunde anzeigen" name="Render Friends Only"/>
 	</menu>
 	<menu label="Bauen" name="BuildTools">
diff --git a/indra/newview/skins/default/xui/de/panel_fs_performance_nearby.xml b/indra/newview/skins/default/xui/de/panel_fs_performance_nearby.xml
index 9cab18bdf4..eff8626eeb 100644
--- a/indra/newview/skins/default/xui/de/panel_fs_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/de/panel_fs_performance_nearby.xml
@@ -32,7 +32,14 @@
 	<text name="av_nearby_desc3">
 		Hinweis: Für den Einfluss des eigenen Avatars den Reiter "Eigene Avatar-Komplexität" öffnen.
 	</text>
-	<check_box label="Freunde immer komplett darstellen" name="display_friends" />
+	<text name="AvatarComplexityMode_Label">
+		Avatar-Anzeige:
+	</text>
+	<combo_box name="AvatarComplexityMode">
+		<combo_box.item label="Komplexitätsbegrenzung" name="complexity_limit_everone"/>
+		<combo_box.item label="Freunde immer anzeigen" name="complexity_always_show_friends"/>
+		<combo_box.item label="Nur Freunde anzeigen" name="complexity_only_show_friends"/>
+	</combo_box>
 	<button label="Ausnahmen..." name="exceptions_btn" />
 	<check_box label="Alle Avatare verstecken (Gut für Landschaftsaufnahmen) " name="hide_avatars" />
 	<text name="name_tags_textbox">
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index d4ecea2c6e..d1f570a89d 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -103,7 +103,7 @@
 		</text>
 		<slider label="Max. Partikelanzahl:" name="MaxParticleCount"/>
 		<text  width="125" name="AvatarComplexityModeLabel">
-			Avatar-Darstellung:
+			Avatar-Anzeige:
 		</text>
 		<combo_box name="AvatarComplexityMode" width="175">
 			<combo_box.item label="Komplexitätsbegrenzung" name="0"/>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index cce0ee7adb..58ba18f279 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1587,6 +1587,40 @@
           function="Floater.Toggle"
           parameter="fs_avatar_render_settings" />
       </menu_item_call>
+      <menu
+        label="Avatar Display"
+        name="AvatarComplexityMode">
+        <menu_item_check
+          label="Limit by Complexity"
+          name="complexity_limit_everone">
+          <menu_item_check.on_click
+            function="World.RenderAvatarComplexityMode"
+            parameter="everyone"/>
+          <menu_item_check.on_check
+            function="World.CheckRenderAvatarComplexityMode"
+            parameter="everyone"/>
+        </menu_item_check>
+        <menu_item_check
+          label="Always show Friends"
+          name="complexity_always_show_friends">
+          <menu_item_check.on_click
+            function="World.RenderAvatarComplexityMode"
+            parameter="always_friends"/>
+          <menu_item_check.on_check
+            function="World.CheckRenderAvatarComplexityMode"
+            parameter="always_friends"/>
+        </menu_item_check>
+        <menu_item_check
+          label="Only show Friends"
+          name="complexity_only_show_friends">
+          <menu_item_check.on_click
+            function="World.RenderAvatarComplexityMode"
+            parameter="only_friends"/>
+          <menu_item_check.on_check
+            function="World.CheckRenderAvatarComplexityMode"
+            parameter="only_friends"/>
+        </menu_item_check>
+     </menu>
       <menu_item_check
         label="Show Friends only"
         name="Render Friends Only">
diff --git a/indra/newview/skins/default/xui/en/panel_fs_performance_nearby.xml b/indra/newview/skins/default/xui/en/panel_fs_performance_nearby.xml
index 18dc8ca0a8..9a56e57961 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_performance_nearby.xml
@@ -204,18 +204,37 @@ top="0">
    width="580">
      Note: Your own avatar includes viewer overheads. Use the attachment tab to see how you affect others.
   </text>
-  <check_box
-    control_name="AlwaysRenderFriends"
+  <text
     height="16"
-    initial_value="true"
-    label="Always display friends in full detail"
-    label_text.text_color="White"
     layout="topleft"
-    name="display_friends"
-    top_pad="2"
+    name="AvatarComplexityMode_Label"
+    top_delta="25"
     left="18"
-    width="256">
-  </check_box>
+    width="100">
+     Avatar Display:
+   </text>
+    <combo_box
+     control_name="RenderAvatarComplexityMode"
+     follows="left|top"
+     height="23"
+     layout="topleft"
+     left_pad="5"
+     top_delta="-4"
+     name="AvatarComplexityMode"
+     width="200">
+        <combo_box.item
+         label="Limit by Complexity"
+         name="complexity_limit_everone"
+         value="0" />
+        <combo_box.item
+         label="Always show Friends"
+         name="complexity_always_show_friends"
+         value="1" />
+        <combo_box.item
+         label="Only show Friends"
+         name="complexity_only_show_friends"
+         value="2" />
+    </combo_box>
   <button
     height="23"
     label="Exceptions..."
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 181fba68b4..5444d8c410 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -604,15 +604,15 @@
          name="AvatarComplexityMode"
          width="150">
             <combo_box.item
-             label="Limit by complexity"
+             label="Limit by Complexity"
              name="0"
              value="0"/>
             <combo_box.item
-             label="Always show friends"
+             label="Always show Friends"
              name="1"
              value="1"/>
             <combo_box.item
-             label="Only show friends"
+             label="Only show Friends"
              name="2"
              value="2"/>
         </combo_box>