diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
| commit | 6db6d81b0a90fe7b48a3ccf64ba768e5772397c8 (patch) | |
| tree | c3b9f11fbbfa29cd23b7de22543fd80285ad810d /indra/newview/app_settings/settings.xml | |
| parent | c0af95e18c57a7e0578df780697042f8a6221431 (diff) | |
Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e964799e4c..993033aa2c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -561,17 +561,6 @@ <key>Value</key> <integer>1</integer> </map> - <key>AvatarCompositeLimit</key> - <map> - <key>Comment</key> - <string>Maximum number of avatars to display appearance changes on the fly</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>5</integer> - </map> <key>AvatarFeathering</key> <map> <key>Comment</key> @@ -6152,6 +6141,17 @@ <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> @@ -9922,6 +9922,17 @@ <key>Value</key> <string>c80260ba-41fd-8a46-768a-6bf236360e3a</string> </map> + <key>UploadBakedTexOld</key> + <map> + <key>Comment</key> + <string>Forces the baked texture pipeline to upload using the old method.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>UseAltKeyForMenus</key> <map> <key>Comment</key> |