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

SOCIAL-622 FIX Double clicking on mini map in people panel places a red circle that cannot be removed and tooltip references opening world map

master
Richard Linden 2011-03-02 21:04:30 -08:00
parent c557692aa7
commit 3c43ec4a96
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llnetmap.cpp
View File

@ -904,23 +904,29 @@ BOOL LLNetMap::handleClick(S32 x, S32 y, MASK mask)
BOOL LLNetMap::handleDoubleClick(S32 x, S32 y, MASK mask)
{
LLVector3d pos_global = viewPosToGlobal(x, y);
// If we're not tracking a beacon already, double-click will set one
if (!LLTracker::isTracking(NULL))
bool double_click_teleport = gSavedSettings.getBOOL("DoubleClickTeleport");
bool double_click_show_world_map = gSavedSettings.getBOOL("DoubleClickShowWorldMap");
if (double_click_teleport || double_click_show_world_map)
{
LLFloaterWorldMap* world_map = LLFloaterWorldMap::getInstance();
if (world_map)
// If we're not tracking a beacon already, double-click will set one
if (!LLTracker::isTracking(NULL))
{
world_map->trackLocation(pos_global);
LLFloaterWorldMap* world_map = LLFloaterWorldMap::getInstance();
if (world_map)
{
world_map->trackLocation(pos_global);
}
}
}
if (gSavedSettings.getBOOL("DoubleClickTeleport"))
if (double_click_teleport)
{
// If DoubleClickTeleport is on, double clicking the minimap will teleport there
gAgent.teleportViaLocationLookAt(pos_global);
}
else if (gSavedSettings.getBOOL("DoubleClickShowWorldMap"))
else if (double_click_show_world_map)
{
LLFloaterReg::showInstance("world_map");
}