From 36fccc3888c5dc318a8a235da8a5cae4faeb637d Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 30 Apr 2008 23:30:09 +0000
Subject: svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r
 84579:85724 maint-ui-11-qa).

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 73a832ead7..e954d97310 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5903,6 +5903,17 @@
         <key>Value</key>
             <real>0.25</real>
         </map>
+    <key>RenderUnloadedAvatar</key>
+        <map>
+        <key>Comment</key>
+            <string>Show avatars which haven't finished loading</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
     <key>RenderVBOEnable</key>
         <map>
         <key>Comment</key>
-- 
cgit v1.2.3