diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-12-17 16:21:54 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-17 16:21:54 -0800 |
| commit | b29b9c961900f98121ba80447e1e737cff0d4331 (patch) | |
| tree | 0635965e3cbce94bd686de873d8a0b85f5755172 /indra/newview/app_settings | |
| parent | abe0eb2ba72d644c3e4b717b391ca9cbcead162c (diff) | |
| parent | 6580d70412220d9536196da9fe1f1f5b79f6f828 (diff) | |
Merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 578f8fd4f0..6fa839235a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5834,17 +5834,6 @@ <key>Value</key> <integer>35</integer> </map> - <key>RenderAvatarInvisible</key> - <map> - <key>Comment</key> - <string>Set your avatar as Invisible</string> - <key>Persist</key> - <integer>0</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>RenderAvatarVP</key> <map> <key>Comment</key> @@ -7792,6 +7781,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>ShowDebugAppearanceEditor</key> + <map> + <key>Comment</key> + <string>Show debugging appearance editor</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>ShowEmptyFoldersWhenSearching</key> <map> <key>Comment</key> @@ -7890,7 +7890,18 @@ <string>Boolean</string> <key>Value</key> <integer>1</integer> - </map> + </map> + <key>ShowObjectRenderingCost</key> + <map> + <key>Comment</key> + <string>Show the object rendering cost in build tools</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>ShowNavbarFavoritesPanel</key> <map> <key>Comment</key> |