Merge branch 'weekly' into branding

Conflicts (solved):
	linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llappviewerwin32.cpp

1 files changed, 47 insertions, 0 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 24f4d9a..85574e6 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -419,6 +419,42 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+
+  <!-- Display Names -->
+    <key>DisplayNamesUsage</key>
+    <map>
+      <key>Comment</key>
+      <string>Usage type for display names: 0 = Legacy name only, 1 = display name only (legacy name when absent), 2 = Display name with legacy name</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>2</integer>
+    </map>
+    <key>OmitResidentAsLastName</key>
+    <map>
+      <key>Comment</key>
+      <string>Do not display "Resident" as the last name for new residents in their legacy name</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>LegacyNamesForFriends</key>
+    <map>
+      <key>Comment</key>
+      <string>When TRUE, forces the use of the legacy names for the friends list and online notifications</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+
   <key>EmeraldTemporaryUpload</key>
   <map>
     <key>Comment</key>
@@ -1330,6 +1366,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>WarnFirstPrivacy</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables FirstPrivacy warning on login</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>WarnFirstVoiceLicense</key>
   <map>
     <key>Comment</key>