diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-01-08 16:33:43 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-01-08 16:33:43 -0500 |
| commit | d9b83077867f6171743c934caf868d8e961152c4 (patch) | |
| tree | 0dca320e442f8844fbdb522666453a0673f9e822 /indra/newview/lltoolpie.cpp | |
| parent | a2d4b740ed1e633b1e479157b74fe3181beeaa2b (diff) | |
| parent | 0a3781673f7e95110d33df0332a4abe238f4c769 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 9ee848e30f..412878eef5 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -731,10 +731,11 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask) LLInspector::Params p; p.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>()); p.message(avatar_name); - p.image(LLUI::getUIImage("Info")); + p.image.name("Inspector_I"); 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.wrap(false); LLToolTipMgr::instance().show(p); @@ -821,7 +822,7 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask) LLInspector::Params p; p.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>()); p.message(tooltip_msg); - p.image(LLUI::getUIImage("Info_Off")); + p.image.name("Inspector_I"); p.click_callback(boost::bind(showObjectInspector, hover_object->getID(), mHoverPick.mObjectFace)); p.time_based_media(is_time_based_media); p.web_based_media(is_web_based_media); @@ -830,6 +831,7 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask) 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.wrap(false); LLToolTipMgr::instance().show(p); |