Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.

svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8

1 files changed, 17 insertions, 6 deletions

diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index dab88a5ec3..893e7acd7a 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -22,17 +22,28 @@
         <key>Value</key>
             <string>|TOKEN COPY BusyModeResponse|</string>
         </map>
-    <key>IMLogTimestamp</key>
+    <key>IMLogOptions</key>
         <map>
         <key>Comment</key>
-            <string>Log Timestamp of Instant Messages</string>
+            <string>Log options for Instant Messages</string>
         <key>Persist</key>
             <integer>1</integer>
         <key>Type</key>
-            <string>Boolean</string>
+            <string>S32</string>
         <key>Value</key>
-            <integer>1</integer>
+            <integer>2</integer>
         </map>
+    <key>InstantMessageLogFolder</key>
+        <map>
+        <key>Comment</key>
+            <string>Top level folder to your log files.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>				
     <key>InstantMessageLogPath</key>
         <map>
         <key>Comment</key>
@@ -77,10 +88,10 @@
         <key>Value</key>
             <integer>0</integer>
         </map>
-    <key>LogChatTimestamp</key>
+    <key>LogTimestamp</key>
         <map>
         <key>Comment</key>
-            <string>Log Timestamp of Chat</string>
+            <string>Log Timestamp</string>
         <key>Persist</key>
             <integer>1</integer>
         <key>Type</key>