livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-2418 add price to object tooltip

meow-7.2.2
angela 2010-03-09 10:04:36 +08:00
parent 1788f26b4c
commit 032762fecf
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/lltoolpie.cpp
View File

@ -901,6 +901,16 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
|| !existing_inspector->getVisible()
|| existing_inspector->getKey()["object_id"].asUUID() != hover_object->getID()))
{
// Add price to tooltip for items on sale
bool for_sale = for_sale_selection(nodep);
if(for_sale)
{
LLStringUtil::format_map_t args;
args["[PRICE]"] = llformat ("%d", nodep->mSaleInfo.getSalePrice());
tooltip_msg.append(LLTrans::getString("TooltipPrice", args) );
}
if (nodep->mName.empty())
{
tooltip_msg.append(LLTrans::getString("TooltipNoName"));
@ -954,15 +964,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
}
}
}
// Add price to tooltip for items on sale
bool for_sale = for_sale_selection(nodep);
if(for_sale)
{
LLStringUtil::format_map_t args;
args["[PRICE]"] = llformat ("%d", nodep->mSaleInfo.getSalePrice());
tooltip_msg.append(LLTrans::getString("TooltipPrice", args) );
}
// Avoid showing tip over media that's displaying unless it's for sale
// also check the primary node since sometimes it can have an action even though

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -77,7 +77,7 @@
<string name="TooltipMapUrl">Click to view this location on a map</string>
<string name="TooltipSLAPP">Click to run the secondlife:// command</string>
<string name="CurrentURL" value=" CurrentURL: [CurrentURL]" />
<string name="TooltipPrice" value="-[PRICE]L$" />
<string name="TooltipPrice" value=" L$[PRICE]-" />
<!-- text for SLURL labels -->