diff options
| author | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
| commit | ada0f4fa221f2c7070fb02a2b7ff903bdde11c45 (patch) | |
| tree | 0ede83511c304110138c01d16da2fff55162ef31 /indra/newview/app_settings | |
| parent | b1a280841e1823a19658923a8eefeb67d1d70735 (diff) | |
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 83 |
1 files changed, 36 insertions, 47 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 99b662a63f..94a5f5c52b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3673,7 +3673,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <string>0.1</string> + <real>0.15</real> </map> <key>InstallLanguage</key> <map> @@ -7585,7 +7585,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>ShowCameraButton</key> <map> @@ -8456,18 +8456,40 @@ <key>Value</key> <real>0.2</real> </map> - <key>ToolTipVisibleTime</key> - <map> - <key>Comment</key> - <string>Fade tooltip after mouse is idle for this long</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>10.0</real> - </map> - <key>ToolboxAutoMove</key> + <key>ToolTipVisibleTimeFar</key> + <map> + <key>Comment</key> + <string>Fade tooltip after after time passes (seconds) while mouse not near tooltip</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>1.0</real> + </map> + <key>ToolTipVisibleTimeNear</key> + <map> + <key>Comment</key> + <string>Fade tooltip after after time passes (seconds) while mouse near tooltip</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>5.0</real> + </map> + <key>ToolTipVisibleTimeOver</key> + <map> + <key>Comment</key> + <string>Fade tooltip after after time passes (seconds) while mouse over tooltip</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>1000.0</real> + </map> + <key>ToolboxAutoMove</key> <map> <key>Comment</key> <string>[NOT USED]</string> @@ -9655,39 +9677,6 @@ <key>Value</key> <integer>15</integer> </map> - <key>UITextEditorBorder</key> - <map> - <key>Comment</key> - <string>UI Text Editor Border</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>UITextEditorHPad</key> - <map> - <key>Comment</key> - <string>UI Text Horizontal Pad</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>4</integer> - </map> - <key>UITextEditorVPadTop</key> - <map> - <key>Comment</key> - <string>UI Text Vertical Pad Top</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>4</integer> - </map> <key>UploadBakedTexOld</key> <map> <key>Comment</key> |