3 files changed, 48 insertions, 0 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index b47ceff446..635e5e40f5 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -295,4 +295,19 @@
          is_running_function="Floater.IsOpen"
          is_running_parameters="performance"
            />
+  <command name="favoritefolder"
+         available_in_toybox="true"
+         icon="Command_FavoriteFolder_Icon"
+         label_ref="Command_FavoriteFolder_Label"
+         tooltip_ref="Command_FavoriteFolder_Tooltip"
+         execute_function="Inventory.OpenFavoriteFolder"
+         is_running_function="Inventory.IsFavoriteFolderOpen"
+           />
+  <command name="resync_animations"
+           available_in_toybox="true"
+           icon="Command_Resync_Animations"
+           label_ref="Command_ResyncAnimations_Label"
+           tooltip_ref="Command_ResyncAnimations_Tooltip"
+           execute_function="Tools.ResyncAnimations"
+           />
 </commands>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index bd49f003c5..42d4e7bb7f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -46,6 +46,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+    <key>IMNearbySessionFirst</key>
+    <map>
+      <key>Comment</key>
+      <string>Put nearby session always first(last).</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>IMShowTime</key>
     <map>
       <key>Comment</key>
@@ -2546,6 +2557,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>DoubleClickZoomIn</key>
+    <map>
+      <key>Comment</key>
+      <string>Set double-click to zoom in on instead of IM avatar</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>DynamicCameraStrength</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 6b788dd78f..80a4bec57f 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -458,5 +458,16 @@
         <key>Value</key>
         <integer>2</integer>
       </map>
+      <key>FavoriteFolder</key>
+      <map>
+        <key>Comment</key>
+        <string>Favorite inventory folder (UUID)</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>String</string>
+        <key>Value</key>
+        <string></string>
+      </map>
     </map>
 </llsd>