diff options
| author | Richard Linden <none@none> | 2011-02-25 15:44:31 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-02-25 15:44:31 -0800 |
| commit | fabf9607af47ead8530d0feff41effb9736d0120 (patch) | |
| tree | d5361ac381565a4940955fdb7fe99a70a9a80964 /indra | |
| parent | 4619a1e58bd53307bf5b2e326d814eddad73fbb1 (diff) | |
SOCIAL-548 FIX shorten delay for avatar inspector tooltips
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 11 | ||||
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 4 |
3 files changed, 35 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 71ff7177ee..162c479398 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12399,5 +12399,27 @@ <key>Value</key> <integer>0</integer> </map> + <key>AvatarInspectorTooltipDelay</key> + <map> + <key>Comment</key> + <string>Seconds before displaying avatar inspector tooltip</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>0.35</real> + </map> + <key>ObjectInspectorTooltipDelay</key> + <map> + <key>Comment</key> + <string>Seconds before displaying object inspector tooltip</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>0.35</real> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 3130c7802c..2d70c79969 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -221,5 +221,16 @@ <key>Value</key> <integer>1</integer> </map> + <key>AvatarInspectorTooltipDelay</key> + <map> + <key>Comment</key> + <string>Seconds before displaying avatar inspector tooltip</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>0.1</real> + </map> </map> </llsd> diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 562b9219b4..19d7b70101 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -936,7 +936,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l p.click_callback(boost::bind(showAvatarInspector, hover_object->getID())); p.visible_time_near(6.f); p.visible_time_far(3.f); - p.delay_time(0.35f); + p.delay_time(gSavedSettings.getF32("AvatarInspectorTooltipDelay")); p.wrap(false); LLToolTipMgr::instance().show(p); @@ -1054,7 +1054,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l p.click_homepage_callback(boost::bind(VisitHomePage, mHoverPick)); p.visible_time_near(6.f); p.visible_time_far(3.f); - p.delay_time(0.35f); + p.delay_time(gSavedSettings.getF32("ObjectInspectorTooltipDelay")); p.wrap(false); LLToolTipMgr::instance().show(p); |