checkpoint, non functional

1 files changed, 71 insertions, 0 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index b6858b7..e55684a 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -198,6 +198,30 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+<!--[$PLOTR$]-->
+                <key>EmeraldUseOTR</key>
+                <map>
+                        <key>Comment</key>
+                        <string>Setting this to 0 will require the use of OTR in every IM, 1 will try OTR when available, 2 will accept incoming OTR requests, and 3 will deny OTR usage</string>
+                        <key>Persist</key>
+                        <integer>1</integer>
+                        <key>Type</key>
+                        <string>U32</string>
+                        <key>Value</key>
+                        <integer>2</integer>
+                </map>
+                <key>EmeraldOTRInTypingStop</key>
+                <map>
+                        <key>Comment</key>
+                        <string>Setting this to true will make all encrypted OTR messages be sent in an IM_TYPING_STOP packet.  This is non-standard behavior, but prevents OTR encrypted IM from being saved and delivered as offline IM.  Though it currently works the grid owners may decide to disable the feature at any time.</string>
+                        <key>Persist</key>
+                        <integer>1</integer>
+                        <key>Type</key>
+                        <string>Boolean</string>
+                        <key>Value</key>
+                        <integer>0</integer>
+                </map>
+<!--[$PLOTR$/]-->
   <key>AppearanceAnimate</key>
   <map>
     <key>Comment</key>
@@ -5644,6 +5668,40 @@
       <integer>0</integer>
     </array>
   </map>
+<!--[$PLOTR$]-->
+                <key>OtrFloaterSmpDialogRect</key>
+                <map>
+                        <key>Comment</key>
+                        <string>Rectangle for OTR's Authorize Buddy Dialog</string>
+                        <key>Persist</key>
+                        <integer>1</integer>
+                        <key>Type</key>
+                        <string>Rect</string>
+                        <key>Value</key>
+                        <array>
+                                <integer>0</integer>
+                                <integer>440</integer>
+                                <integer>470</integer>
+                                <integer>0</integer>
+                        </array>
+                </map>
+                <key>OtrFloaterSmpProgRect</key>
+                <map>
+                        <key>Comment</key>
+                        <string>Rectangle for OTR's Authorize Buddy Progress bar Dialog</string>
+                        <key>Persist</key>
+                        <integer>1</integer>
+                        <key>Type</key>
+                        <string>Rect</string>
+                        <key>Value</key>
+                        <array>
+                                <integer>0</integer>
+                                <integer>440</integer>
+                                <integer>470</integer>
+                                <integer>0</integer>
+                        </array>
+                </map>
+<!--[$PLOTR$/]-->
   <key>FloaterActiveSpeakersRect</key>
   <map>
     <key>Comment</key>
@@ -13805,6 +13863,19 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+<!--[$PLOTR$]-->
+                <key>WarnEmeraldOTR</key>
+                <map>
+                        <key>Comment</key>
+                        <string>Enables OTR info dialog</string>
+                        <key>Persist</key>
+                        <integer>1</integer>
+                        <key>Type</key>
+                        <string>Boolean</string>
+                        <key>Value</key>
+                        <integer>1</integer>
+                </map>
+<!--[$PLOTR$/]-->
     <key>WarnFirstAppearance</key>
     <map>
       <key>Comment</key>