Merge remote-tracking branch 'lirusaito/master'

indra/newview/app_settings/settings.xml

@@ -990,6 +990,32 @@ Found in Advanced->Rendering->Info Displays</string>
       <key>Value</key>
       <string/>
     </map>
+    <key>ScriptMessageAPI</key>
+    <map>
+      <key>Comment</key>
+      <string>Channel used for interaction with the Script Message API</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>0</integer>
+      <key>IsCOA</key>
+      <integer>1</integer>
+    </map>
+    <key>ScriptMessageAPIKey</key>
+    <map>
+      <key>Comment</key>
+      <string>Key to encode messages sent to the Script Message API</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>Enter Key Here</string>
+      <key>IsCOA</key>
+      <integer>1</integer>
+    </map>
     <key>UseConciseIMButtons</key>
     <map>
       <key>Comment</key>

indra/newview/app_settings/settings_rlv.xml

@@ -57,17 +57,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-  <key>RestrainedLoveOffsetAvatarZ</key>
-   <map>
-     <key>Comment</key>
-    <string>Offset the avatar.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>F32</string>
-    <key>Value</key>
-    <real>0.0</real>
-  </map>
   <key>RestrainedLoveReplaceWhenFolderBeginsWith</key>
   <map>
     <key>Comment</key>
@@ -222,17 +211,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>WarnFirstRLVGiveToRLV</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstRLVGiveToRLV warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>ForceInitialCOFDelay</key>
     <map>
       <key>Comment</key>