Skip to content
Snippets Groups Projects
Commit 298c829b authored by James Cook's avatar James Cook
Browse files

Fix 3D object tooltip backgrounds appearing gray

Image "none" wasn't being properly converted to a NULL pointer,
so was drawing the default gray image.
Reviewed with Richard
parent 69004fa2
Branches
Tags
No related merge requests found
...@@ -168,6 +168,7 @@ namespace LLInitParam ...@@ -168,6 +168,7 @@ namespace LLInitParam
if (name() == "none") if (name() == "none")
{ {
mData.mValue = NULL; mData.mValue = NULL;
return;
} }
LLUIImage* imagep = LLUI::getUIImage(name()); LLUIImage* imagep = LLUI::getUIImage(name());
......
...@@ -731,6 +731,7 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask) ...@@ -731,6 +731,7 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask)
// *HACK: We may select this object, so pretend it was clicked // *HACK: We may select this object, so pretend it was clicked
mPick = mHoverPick; mPick = mHoverPick;
LLInspector::Params p; LLInspector::Params p;
p.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());
p.message(avatar_name); p.message(avatar_name);
p.image(LLUI::getUIImage("Info")); p.image(LLUI::getUIImage("Info"));
p.click_callback(boost::bind(showAvatarInspector, hover_object->getID())); p.click_callback(boost::bind(showAvatarInspector, hover_object->getID()));
...@@ -738,8 +739,6 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask) ...@@ -738,8 +739,6 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask)
p.visible_time_far(3.f); p.visible_time_far(3.f);
p.wrap(false); p.wrap(false);
p.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());
LLToolTipMgr::instance().show(p); LLToolTipMgr::instance().show(p);
} }
} }
...@@ -822,6 +821,7 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask) ...@@ -822,6 +821,7 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask)
// We may select this object, so pretend it was clicked // We may select this object, so pretend it was clicked
mPick = mHoverPick; mPick = mHoverPick;
LLInspector::Params p; LLInspector::Params p;
p.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());
p.message(tooltip_msg); p.message(tooltip_msg);
p.image(LLUI::getUIImage("Info_Off")); p.image(LLUI::getUIImage("Info_Off"));
p.click_callback(boost::bind(showObjectInspector, hover_object->getID(), mHoverPick.mObjectFace)); p.click_callback(boost::bind(showObjectInspector, hover_object->getID(), mHoverPick.mObjectFace));
...@@ -834,8 +834,6 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask) ...@@ -834,8 +834,6 @@ BOOL LLToolPie::handleToolTip(S32 local_x, S32 local_y, MASK mask)
p.visible_time_far(3.f); p.visible_time_far(3.f);
p.wrap(false); p.wrap(false);
p.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());
LLToolTipMgr::instance().show(p); LLToolTipMgr::instance().show(p);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment