diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-02 23:15:38 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-02 23:15:38 +0300 |
| commit | 363e9c949bf1179575fafa65d504d04383efbc1e (patch) | |
| tree | d5ae7ad286b42c602293f2081969790e9285b035 /indra/newview/app_settings/settings.xml | |
| parent | aaaf3189c400e491c6adc533f8b03dfecddb1dd9 (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
Merge branch 'master' into DRTVWR-503-maint
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 75ef9c76fd..41e5171f19 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -16384,7 +16384,7 @@ <key>FMODExProfilerEnable</key> <map> <key>Comment</key> - <string>Enable profiler tool if using FMOD Ex</string> + <string>Enable profiler tool if using FMOD Ex or FMOD Studio</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -16395,7 +16395,7 @@ <key>FMODExDecodeBufferSize</key> <map> <key>Comment</key> - <string>Sets the streaming decode buffer size (in milliseconds)</string> + <string>Sets the streaming decode buffer size (in milliseconds) for FMOD Ex or FMOD Studio</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -16406,7 +16406,7 @@ <key>FMODExStreamBufferSize</key> <map> <key>Comment</key> - <string>Sets the streaming buffer size (in milliseconds)</string> + <string>Sets the streaming buffer size (in milliseconds) for FMOD Ex or FMOD Studio</string> <key>Persist</key> <integer>1</integer> <key>Type</key> |