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

Also enable the map button on the region tracker if no region is selected for less annoyance

master
Ansariel 2015-11-25 16:53:25 +01:00
parent ac11b7b66c
commit 08db042da2
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/alfloaterregiontracker.cpp
View File

@ -104,7 +104,7 @@ void ALFloaterRegionTracker::updateHeader()
S32 num_selected(mRegionScrollList->getNumSelected());
mRefreshRegionListBtn->setEnabled(mRegionMap.size() != 0);
mRemoveRegionBtn->setEnabled(!!num_selected);
mOpenMapBtn->setEnabled(num_selected == 1);
mOpenMapBtn->setEnabled(num_selected <= 1);
}
void ALFloaterRegionTracker::refresh()
@ -291,11 +291,18 @@ void ALFloaterRegionTracker::onRegionAddedCallback(const LLSD& notification, con
void ALFloaterRegionTracker::openMap()
{
const std::string& region = mRegionScrollList->getFirstSelected()->getValue().asString();
LLFloaterWorldMap* worldmap_floaterp = LLFloaterWorldMap::getInstance();
if (!region.empty() && worldmap_floaterp)
if (mRegionScrollList->getNumSelected() == 0)
{
worldmap_floaterp->trackURL(region, 128, 128, 0);
LLFloaterReg::showInstance("world_map", "center");
}
else
{
const std::string& region = mRegionScrollList->getFirstSelected()->getValue().asString();
LLFloaterWorldMap* worldmap_floaterp = LLFloaterWorldMap::getInstance();
if (!region.empty() && worldmap_floaterp)
{
worldmap_floaterp->trackURL(region, 128, 128, 0);
LLFloaterReg::showInstance("world_map", "center");
}
}
}