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

SL-10951 There were no tool-tips for the 'Edit' and 'Play' buttons in the 'Gestures' floater

master
andreykproductengine 2019-04-15 15:57:14 +03:00
parent 30b36a7215
commit dd9141306b
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llsidepanelinventory.cpp
View File

@ -564,6 +564,7 @@ void LLSidepanelInventory::updateVerbs()
mWearBtn->setEnabled(FALSE);
mPlayBtn->setVisible(FALSE);
mPlayBtn->setEnabled(FALSE);
mPlayBtn->setToolTip(std::string(""));
mTeleportBtn->setVisible(FALSE);
mTeleportBtn->setEnabled(FALSE);
mShopBtn->setVisible(TRUE);
@ -588,11 +589,23 @@ void LLSidepanelInventory::updateVerbs()
mShopBtn->setVisible(FALSE);
break;
case LLInventoryType::IT_SOUND:
mPlayBtn->setVisible(TRUE);
mPlayBtn->setEnabled(TRUE);
mPlayBtn->setToolTip(LLTrans::getString("InventoryPlaySoundTooltip"));
mShopBtn->setVisible(FALSE);
break;
case LLInventoryType::IT_GESTURE:
mPlayBtn->setVisible(TRUE);
mPlayBtn->setEnabled(TRUE);
mPlayBtn->setToolTip(LLTrans::getString("InventoryPlayGestureTooltip"));
mShopBtn->setVisible(FALSE);
break;
case LLInventoryType::IT_ANIMATION:
mPlayBtn->setVisible(TRUE);
mPlayBtn->setEnabled(TRUE);
mShopBtn->setVisible(FALSE);
mPlayBtn->setEnabled(TRUE);
mPlayBtn->setToolTip(LLTrans::getString("InventoryPlayAnimationTooltip"));
mShopBtn->setVisible(FALSE);
break;
case LLInventoryType::IT_LANDMARK:
mTeleportBtn->setVisible(TRUE);

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

@ -119,6 +119,7 @@
follows="left|bottom"
height="23"
label="Edit"
tool_tip="Open window for editing selected gesture."
layout="topleft"
left="6"
name="edit_btn"
@ -128,6 +129,7 @@
follows="left|bottom"
height="23"
label="Play"
tool_tip="Execute selected gesture in-world."
layout="topleft"
left_pad="6"
name="play_btn"

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

@ -2302,6 +2302,9 @@ For AI Character: Get the closest navigable point to the point provided.
<string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string>
<string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports</string>
<string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string>
<string name="InventoryPlayAnimationTooltip">Open window with Play options.</string>
<string name="InventoryPlayGestureTooltip">Execute selected gesture in-world.</string>
<string name="InventoryPlaySoundTooltip">Open window with Play options.</string>
<string name="InventoryOutboxNotMerchantTitle">Anyone can sell items on the Marketplace.</string>
<string name="InventoryOutboxNotMerchantTooltip"></string>
<string name="InventoryOutboxNotMerchant">