Merged in RLVa. Viewer broken!

2010-11-07 05:05:47 +01:00
parent ae4a9521af
commit 740b570168
94 changed files with 11249 additions and 503 deletions
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -1,5 +1,20 @@
 <llsd>
    <map>
+      <key>RLVaLoginLastLocation</key>
+      <map>
+        <key>Comment</key>
+        <string>Determines whether the next login will be forced to the last logoff location (set by the viewer)</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>Boolean</string>
+        <key>Value</key>
+        <integer>1</integer>
+      </map>
+      <key>BusyModeResponse</key>
+        <map>
+        <key>Comment</key>
+            <string>Auto response to instant messages while in busy mode.</string>
 	<key>AO.Settings</key>
 	 <map>
 	 <key>Comment</key>