diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-08-22 13:18:12 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-08-22 13:18:12 -0500 |
| commit | a3a811606088f1b40d9e098ddff8b38a2420b8e9 (patch) | |
| tree | 5203dfa631fa87a4563c002ab117f1ae5c5dfbaf /indra/newview/app_settings | |
| parent | 894c9e0417e7b29aaf31c673ca040dff93eb36ef (diff) | |
| parent | ef33902f220df35727ba54ee8bc3ed02bc53d6be (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/logcontrol.xml | 1 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index 2a26cb9a43..482012cdd6 100644 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -73,7 +73,6 @@ <string>Avatar</string> <string>Voice</string> --> - <string>Capabilities</string> </array> </map> </array> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4612ee1a82..ee4c76943e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -250,7 +250,7 @@ <key>TextureLivePreview</key> <map> <key>Comment</key> - <string>Preview selections in texture picker immediately</string> + <string>Preview selections in texture picker or material picker immediately</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -5519,6 +5519,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>LastUIFeatureVersion</key> + <map> + <key>Comment</key> + <string>UI Feature Version number for tracking feature notification between viewer builds</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>LLSD</string> + <key>Value</key> + <string></string> + </map> <key>LastFindPanel</key> <map> <key>Comment</key> |