From 1788f26b4c8fc91836feba298fd0d38564411341 Mon Sep 17 00:00:00 2001 From: angela Date: Mon, 8 Mar 2010 16:17:47 +0800 Subject: EXT-2418 Object hover tips no longer show price, description or owner --- indra/newview/lltoolpie.cpp | 23 +++++++++++++++++------ indra/newview/skins/default/xui/en/strings.xml | 4 +++- 2 files changed, 20 insertions(+), 7 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index fb78b6a415..94e43b1e0e 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -931,7 +931,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l if (media_impl.notNull() && (media_impl->hasMedia())) { is_media_displaying = true; - LLStringUtil::format_map_t args; + //LLStringUtil::format_map_t args; media_plugin = media_impl->getMediaPlugin(); if(media_plugin) @@ -955,13 +955,24 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l } } - // Avoid showing tip over media that's displaying + // 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 // the root node doesn't - bool needs_tip = !is_media_displaying && - (has_media || - needs_tooltip(nodep) || - needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode())); + + bool needs_tip = (!is_media_displaying || + for_sale) && + (has_media || + needs_tooltip(nodep) || + needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode())); if (show_all_object_tips || needs_tip) { diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 59c54f0cad..56147cd72b 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -76,7 +76,9 @@ Click to view this object's description Click to view this location on a map Click to run the secondlife:// command - + + + Teleport to -- cgit v1.2.3 From 032762fecffb913fd6178965befec62d6b5171e7 Mon Sep 17 00:00:00 2001 From: angela Date: Tue, 9 Mar 2010 10:04:36 +0800 Subject: EXT-2418 add price to object tooltip --- indra/newview/lltoolpie.cpp | 20 +++++++++++--------- indra/newview/skins/default/xui/en/strings.xml | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 94e43b1e0e..2f4a69a53c 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -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 diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 56147cd72b..1eaf77c328 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -77,7 +77,7 @@ Click to view this location on a map Click to run the secondlife:// command - + -- cgit v1.2.3 From e349c33fa91505f944bd0e24a5e3a26a5f51197f Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Wed, 10 Mar 2010 10:53:17 -0800 Subject: linguistic change --- indra/newview/skins/default/xui/fr/floater_about_land.xml | 2 +- .../newview/skins/default/xui/fr/floater_preview_texture.xml | 2 +- indra/newview/skins/default/xui/fr/floater_tools.xml | 4 ++-- indra/newview/skins/default/xui/fr/menu_land.xml | 2 +- indra/newview/skins/default/xui/fr/panel_places.xml | 2 +- .../newview/skins/default/xui/fr/panel_preferences_chat.xml | 4 ++-- .../skins/default/xui/fr/panel_preferences_general.xml | 2 +- indra/newview/skins/default/xui/fr/role_actions.xml | 12 ++++++------ 8 files changed, 15 insertions(+), 15 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index ac3bd17c85..b5acd6299a 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -1,5 +1,5 @@ - + "Parcel_PG_Dark" diff --git a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml index 433dc944cf..9fc9d14026 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml @@ -28,7 +28,7 @@ 10:7 - + 3:2 diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml index 64722ff1a7..40765b9e06 100644 --- a/indra/newview/skins/default/xui/fr/floater_tools.xml +++ b/indra/newview/skins/default/xui/fr/floater_tools.xml @@ -1,5 +1,5 @@ - + Pour faire tourner l'objet, faîtes glisser les bandes de couleur. @@ -474,7 +474,7 @@ Surface : [AREA] m² -