Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Lirusaito
2019-03-08 13:38:38 -05:00
parent fec7e95406
commit 4ddac28142
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llfloatertopobjects.cpp
View File

@@ -495,23 +495,11 @@ void LLFloaterTopObjects::onGetByParcelName()
void LLFloaterTopObjects::showBeacon() void LLFloaterTopObjects::showBeacon()
{ {
LLScrollListCtrl* list = getChild<LLScrollListCtrl>("objects_list"); LLVector3d pos_global = getSelectedPosition();
if (!list) return; if (pos_global.isExactlyZero()) return;
LLScrollListItem* first_selected = getChild<LLScrollListCtrl>("objects_list")->getFirstSelected();
LLScrollListItem* first_selected = list->getFirstSelected();
if (!first_selected) return;
std::string name = first_selected->getColumn(1)->getValue().asString(); std::string name = first_selected->getColumn(1)->getValue().asString();
std::string pos_string = first_selected->getColumn(3)->getValue().asString(); LLTracker::trackLocation(pos_global, name, LLStringUtil::null, LLTracker::LOCATION_ITEM);
F32 x, y, z;
S32 matched = sscanf(pos_string.c_str(), "<%g,%g,%g>", &x, &y, &z);
if (matched != 3) return;
LLVector3 pos_agent(x, y, z);
LLVector3d pos_global = gAgent.getPosGlobalFromAgent(pos_agent);
std::string tooltip("");
LLTracker::trackLocation(pos_global, name, tooltip, LLTracker::LOCATION_ITEM);
const LLUUID& taskid = first_selected->getUUID(); const LLUUID& taskid = first_selected->getUUID();
if(LLVOAvatar* voavatar = gObjectList.findAvatar(taskid)) if(LLVOAvatar* voavatar = gObjectList.findAvatar(taskid))