merge

4 files changed, 314 insertions, 307 deletions

diff --git a/indra/newview/app_settings/foldertypes.xml b/indra/newview/app_settings/foldertypes.xml
index 2038779c4f..0d539177f3 100644
--- a/indra/newview/app_settings/foldertypes.xml
+++ b/indra/newview/app_settings/foldertypes.xml
@@ -1,66 +1,61 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <ensemble_defs>
   <ensemble
-    asset_num="-1"
-    xui_name="default"
-    icon_name="inv_plain_closed.tga"
-     />
-  <ensemble
-    asset_num="27"
+    foldertype_num="27"
     xui_name="head"
     icon_name="inv_folder_outfit_head.tga"
 	allowed="hair,eyes"
      />
   <ensemble
-    asset_num="28"
+    foldertype_num="28"
     xui_name="gloves"
     icon_name="inv_folder_outfit_gloves.tga"
 	allowed="gloves"
      />
   <ensemble
-    asset_num="29"
+    foldertype_num="29"
     xui_name="jacket"
     icon_name="inv_folder_outfit_jacket.tga"
 	allowed="jacket"
      />
   <ensemble
-    asset_num="30"
+    foldertype_num="30"
     xui_name="pants"
     icon_name="inv_folder_outfit_pants.tga"
 	allowed="pants,underpants"
      />
   <ensemble
-    asset_num="31"
+    foldertype_num="31"
     xui_name="shape"
     icon_name="inv_folder_outfit_shape.tga"
 	allowed="shape,skin,hair,eyes"
      />
   <ensemble
-    asset_num="32"
+    foldertype_num="32"
     xui_name="shoes"
     icon_name="inv_folder_outfit_shoes.tga"
 	allowed="shoes,socks"
      />
   <ensemble
-    asset_num="33"
+    foldertype_num="33"
     xui_name="shirt"
     icon_name="inv_folder_outfit_shirt.tga"
 	allowed="shirt,undershirt"
      />
   <ensemble
-    asset_num="34"
+    foldertype_num="34"
     xui_name="skirt"
     icon_name="inv_folder_outfit_skirt.tga"
 	allowed=""
      />
   <ensemble
-    asset_num="35"
+    foldertype_num="35"
     xui_name="underpants"
     icon_name="inv_folder_outfit_underpants.tga"
 	allowed="underpants"
      />
   <ensemble
-    asset_num="36"
+    foldertype_num="36"
     xui_name="undershirt"
     icon_name="inv_folder_outfit_undershirt.tga"
 	allowed="undershirt"
diff --git a/indra/newview/app_settings/ignorable_dialogs.xml b/indra/newview/app_settings/ignorable_dialogs.xml
index 669235af1b..ab18febccc 100644
--- a/indra/newview/app_settings/ignorable_dialogs.xml
+++ b/indra/newview/app_settings/ignorable_dialogs.xml
@@ -1,291 +1,291 @@
-<?xml version="1.0" ?>

-<llsd>

-<map>

-    <key>FirstAppearance</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstAppearance warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstAttach</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstAttach warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstBalanceDecrease</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstBalanceDecrease warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstBalanceIncrease</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstBalanceIncrease warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstBuild</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstBuild warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstDebugMenus</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstDebugMenus warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstFlexible</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstFlexible warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstGoTo</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstGoTo warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstInventory</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstInventory warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstLeftClickNoHit</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstLeftClickNoHit warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstMap</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstMap warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstMedia</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstMedia warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstOverrideKeys</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstOverrideKeys warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstSandbox</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstSandbox warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstSculptedPrim</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstSculptedPrim warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstSit</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstSit warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstStreamingMusic</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstStreamingMusic warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstStreamingVideo</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstStreamingVideo warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstTeleport</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstTeleport warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>FirstVoice</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables FirstVoice warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>AboutDirectX9</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables AboutDirectX9 warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>BrowserLaunch</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables BrowserLaunch warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>DeedObject</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables DeedObject warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-  <key>NewClassified</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables NewClassified warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>QuickTimeInstalled</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables QuickTimeInstalled warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-    <key>ReturnToOwner</key>

-    <map>

-      <key>Comment</key>

-      <string>Enables ReturnToOwner warning dialog</string>

-      <key>Persist</key>

-      <integer>1</integer>

-      <key>Type</key>

-      <string>Boolean</string>

-      <key>Value</key>

-      <integer>1</integer>

-    </map>

-  </map>

-</llsd>

+<?xml version="1.0" ?>
+<llsd>
+<map>
+    <key>FirstAppearance</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstAppearance warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstAttach</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstAttach warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstBalanceDecrease</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstBalanceDecrease warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstBalanceIncrease</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstBalanceIncrease warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstBuild</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstBuild warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstDebugMenus</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstDebugMenus warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstFlexible</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstFlexible warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstGoTo</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstGoTo warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstInventory</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstInventory warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstLeftClickNoHit</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstLeftClickNoHit warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstMap</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstMap warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstMedia</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstMedia warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstOverrideKeys</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstOverrideKeys warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstSandbox</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstSandbox warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstSculptedPrim</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstSculptedPrim warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstSit</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstSit warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstStreamingMusic</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstStreamingMusic warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstStreamingVideo</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstStreamingVideo warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstTeleport</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstTeleport warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FirstVoice</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstVoice warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>AboutDirectX9</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables AboutDirectX9 warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>BrowserLaunch</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables BrowserLaunch warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>DeedObject</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables DeedObject warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+  <key>NewClassified</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables NewClassified warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>QuickTimeInstalled</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables QuickTimeInstalled warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>ReturnToOwner</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables ReturnToOwner warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+  </map>
+</llsd>
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 544f1c598e..5f6fd6e4a7 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -560,7 +560,8 @@ STATUS_WHITELIST_FAILED                URL failed to pass whitelist
 NULL_KEY			Indicates an empty key
 EOF					Indicates the last line of a notecard was read
 TEXTURE_BLANK			UUID for the "Blank" texture
-TEXTURE_DEFAULT			UUID for the "Default Media" texture
+TEXTURE_DEFAULT			Alias for TEXTURE_PLYWOOD
+TEXTURE_MEDIA			UUID for the "Default Media" texture
 TEXTURE_PLYWOOD			UUID for the default "Plywood" texture
 TEXTURE_TRANSPARENT		UUID for the "White - Transparent" texture
 
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 768fdd4103..7254fff664 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5558,6 +5558,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>RegInClient</key>
+    <map>
+      <key>Comment</key>
+      <string>Experimental: Embed registration in login screen</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>RegionTextureSize</key>
     <map>
       <key>Comment</key>