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

SL-16824: Fix minimap tooltip hint not updating until viewer restart (double click to show map vs double click to teleport)

master
Cosmic Linden 2022-02-28 11:55:15 -08:00
parent 81da0dd2db
commit 0e927e92f3
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloatermap.cpp
View File

@ -84,14 +84,8 @@ BOOL LLFloaterMap::postBuild()
mMap->setParcelSaleAreaMsg(getString("ParcelSaleAreaMsg"));
mMap->setParcelOwnerMsg(getString("ParcelOwnerMsg"));
mMap->setRegionNameMsg(getString("RegionNameMsg"));
if (gSavedSettings.getBOOL("DoubleClickTeleport"))
{
mMap->setToolTipHintMsg(getString("AltToolTipHintMsg"));
}
else if (gSavedSettings.getBOOL("DoubleClickShowWorldMap"))
{
mMap->setToolTipHintMsg(getString("ToolTipHintMsg"));
}
mMap->setToolTipHintMsg(getString("ToolTipHintMsg"));
mMap->setAltToolTipHintMsg(getString("AltToolTipHintMsg"));
sendChildToBack(mMap);
mTextBoxNorth = getChild<LLTextBox>("floater_map_north");

10
indra/newview/llnetmap.cpp
View File

@ -699,7 +699,15 @@ BOOL LLNetMap::handleToolTip(S32 x, S32 y, MASK mask)
}
}
std::string tool_tip_hint_msg = mToolTipHintMsg;
std::string tool_tip_hint_msg;
if (gSavedSettings.getBOOL("DoubleClickTeleport"))
{
tool_tip_hint_msg = mAltToolTipHintMsg;
}
else if (gSavedSettings.getBOOL("DoubleClickShowWorldMap"))
{
tool_tip_hint_msg = mToolTipHintMsg;
}
LLStringUtil::format_map_t args;
args["[PARCEL_NAME_MSG]"] = parcel_name_msg.empty() ? "" : parcel_name_msg + '\n';

2
indra/newview/llnetmap.h
View File

@ -88,6 +88,7 @@ public:
void setParcelOwnerMsg(const std::string& msg) { mParcelOwnerMsg = msg; }
void setRegionNameMsg(const std::string& msg) { mRegionNameMsg = msg; }
void setToolTipHintMsg(const std::string& msg) { mToolTipHintMsg = msg; }
void setAltToolTipHintMsg(const std::string& msg) { mAltToolTipHintMsg = msg; }
void renderScaledPointGlobal( const LLVector3d& pos, const LLColor4U &color, F32 radius );
@ -140,6 +141,7 @@ private:
std::string mParcelOwnerMsg;
std::string mRegionNameMsg;
std::string mToolTipHintMsg;
std::string mAltToolTipHintMsg;
public:
void setSelected(uuid_vec_t uuids) { gmSelected=uuids; };