diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 16:50:21 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 16:50:21 -0800 |
| commit | 5ed6e0720af1b6cdf1a983e2c040eeb5d8ae33ba (patch) | |
| tree | 5d0141f43cfaf59e5cb62eb2f4ca9541160e6173 /indra/newview/app_settings | |
| parent | 3ab4b0f58326a01a09aa99f262c03d2703215af2 (diff) | |
| parent | 6e932911d5b0a02b44caf3bf81a9c00fd0e1dc89 (diff) | |
warn-on-failure:unix-eol
automated merge from trunk
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/keywords.ini | 4 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index 14025c8061..0805e94b10 100644 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -268,8 +268,8 @@ ATTACH_LHIP Passed to llAttachToAvatar to attach task to left hip ATTACH_LULEG Passed to llAttachToAvatar to attach task to left upper leg ATTACH_LLLEG Passed to llAttachToAvatar to attach task to left lower leg ATTACH_BELLY Passed to llAttachToAvatar to attach task to belly -ATTACH_RPEC Passed to llAttachToAvatar to attach task to right pectoral -ATTACH_LPEC Passed to llAttachToAvatar to attach task to left pectoral +ATTACH_LEFT_PEC Passed to llAttachToAvatar to attach task to left pectoral +ATTACH_RIGHT_PEC Passed to llAttachToAvatar to attach task to right pectoral LAND_LEVEL Passed to llModifyLand to level terrain LAND_RAISE Passed to llModifyLand to raise terrain diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 05f1e71711..f4a0bdb077 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10380,6 +10380,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>VoiceDefaultInternalLevel</key> + <map> + <key>Comment</key> + <string>Internal level of voice set by default. Is equivalent to 0.5 (from 0.0-1.0 range) external voice level (internal = 400 * external^2).</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>100</integer> + </map> <key>VoiceEarLocation</key> <map> <key>Comment</key> |