2 files changed, 34 insertions, 1 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 2cd6638042..a0d3dc0f99 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -37,7 +37,7 @@
            tooltip_ref="Command_Build_Tooltip"
            execute_function="Build.Toggle"
            execute_parameters="build"
-           is_enabled_function="Build.Enabled"
+           is_enabled_function="Build.EnabledOrActive"
            is_enabled_parameters="build"
            is_running_function="Floater.IsOpen"
            is_running_parameters="build"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a7a15c9c7b..8735ca6026 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3723,6 +3723,17 @@
         <key>Value</key>
         <integer>1</integer>
     </map>
+    <key>QueueInventoryFetchTimeout</key>
+    <map>
+        <key>Comment</key>
+        <string>Max time llcompilequeue will wait for inventory fetch to complete (in seconds)</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>F32</string>
+        <key>Value</key>
+        <real>300.0</real>
+    </map>
     <key>FindLandArea</key>
     <map>
       <key>Comment</key>
@@ -11087,6 +11098,28 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>FriendsListHideUsernames</key>
+    <map>
+        <key>Comment</key>
+            <string>Show both Display name and Username in Friend list</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+    </map>
+    <key>NearbyListHideUsernames</key>
+    <map>
+        <key>Comment</key>
+            <string>Show both Display name and Username in Nearby list</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+    </map> 
     <key>NearbyListShowMap</key>
     <map>
       <key>Comment</key>