From 8fa0cdffdd319a476b26a1d9d92a3a18bf2bb1b3 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 31 Oct 2011 23:11:55 +0100
Subject: [PATCH] Added user-definable item height in folder views, for
 instance inventory folder, to save unused space.

---
 indra/newview/app_settings/settings.xml       | 11 +++++
 indra/newview/llfolderviewitem.cpp            |  5 ++-
 .../default/xui/en/panel_preferences_UI.xml   | 41 +++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8057ee4c59..74322ee6b8 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3,6 +3,17 @@
   xsi:noNamespaceSchemaLocation="llsd.xsd">
 <map>
 
+  <key>FSFolderViewItemHeight</key>
+  <map>
+    <key>Comment</key>
+    <string>Controls the height of folder items, for instance in inventory</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>S32</string>
+    <key>Value</key>
+    <integer>20</integer>
+  </map>
   <key>UsePieMenu</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 38fe8914fb..7d3c6c9b92 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -105,7 +105,10 @@ LLFolderViewItem::Params::Params()
 	item_height("item_height"),
 	item_top_pad("item_top_pad"),
 	creation_date()
-{}
+{
+	static LLCachedControl<S32> FolderViewItemHeight(gSavedSettings, "FSFolderViewItemHeight");
+	item_height = (S32)FolderViewItemHeight;
+}
 
 // Default constructor
 LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
index 60db4b83da..e17b664570 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -731,6 +731,47 @@ Default 0. Larger values may not work well.
 V2/3 default 0. V1 default [TODO: unknown].
         </text>
 
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="16"
+         layout="topleft"
+         left="10"
+         name="Label_FolderItemViewHeight"
+         top_pad="15"
+         width="120">
+           Folder Item Height:
+        </text>
+        <spinner
+         top_delta="-5"
+         left_pad="5"
+         height="18"
+         width="50"
+         control_name="FSFolderViewItemHeight"
+         layout="topleft"
+         follows="left|top"
+         increment="1"
+         decimal_digits="0"
+         initial_val="20"
+         min_val="10"
+         max_val="30"
+         name="FSFolderViewItemHeight" />
+        <text
+         name="Label_FolderItemViewHeight_Scale"
+         top_delta="5"
+         left_pad="3"
+         height="36"
+         width="335"
+         layout="topleft"
+         follows="left|top"
+         type="string"
+         length="1"
+         line_spacing.pixels="5">
+          pixels (requires restart)
+V2/3 default 20. V1 default 18.
+        </text>
+
 <!-- not a live preview
         <text
          name="tooltip_textbox"