diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:58:53 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:58:53 -0500 |
| commit | f6ba55b8ed24246be340d069c64d25bd614194a6 (patch) | |
| tree | 3475f87a3326be076158597ecc7e96f341080f2f /indra/newview/app_settings/settings.xml | |
| parent | 3b85391839da9077129830258d4a1d1ce6069cb3 (diff) | |
| parent | 0f72f152e88efd7fc56cf6764f25bd2d0d4bf062 (diff) | |
merge fix for STORM-138
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index cc8ad74526..e5845bc947 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1365,6 +1365,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>LetterKeysFocusChatBar</key> + <map> + <key>Comment</key> + <string>When printable characters keys (possibly with Shift held) are pressed, the chatbar takes focus</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>0</integer> + </map> <key>ChatBubbleOpacity</key> <map> <key>Comment</key> @@ -8340,6 +8351,17 @@ <key>Value</key> <real>1.0</real> </map> + <key>RenderTransparentWater</key> + <map> + <key>Comment</key> + <string>Render water as transparent. Setting to false renders water as opaque with a simple texture applied.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>RenderTreeLODFactor</key> <map> <key>Comment</key> @@ -11905,10 +11927,10 @@ <key>Value</key> <real>150000.0</real> </map> - <key>XUIEditor</key> + <key>ExternalEditor</key> <map> <key>Comment</key> - <string>Path to program used to edit XUI files</string> + <string>Path to program used to edit LSL scripts and XUI files, e.g.: /usr/bin/gedit --new-window "%s"</string> <key>Persist</key> <integer>1</integer> <key>Type</key> |