diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-21 16:25:23 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-21 16:25:23 -0700 |
| commit | 4af7e9eb64097c9fdcef86758fc42932d3ccd477 (patch) | |
| tree | 3d4d5300b0c476d8343baad8d28c0809806d5c8b /indra/newview/app_settings | |
| parent | bb3be2c07f492577254ae9ace5675eb92d10f061 (diff) | |
| parent | e3f5b66d5a649b061e470bba44fa29a56f7b93b5 (diff) | |
Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a22f197b85..fec7e9f1bd 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1918,10 +1918,21 @@ <key>Value</key> <integer>0</integer> </map> + <key>DebugShowTextureInfo</key> + <map> + <key>Comment</key> + <string>Show inertested texture info</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>DebugShowTime</key> <map> <key>Comment</key> - <string>Show depth buffer contents</string> + <string>Show time info</string> <key>Persist</key> <integer>1</integer> <key>Type</key> |