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

Break out get_obj_data into its own function

Browse Source
This commit is contained in:
Liru Færs
2020-01-08 20:43:47 -05:00
parent c466b44143
commit bee60da089
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llviewermenu.cpp
View File

@@ -9042,6 +9042,12 @@ template<typename T> T* get_focused()
return t; return t;
} }
const JCFloaterAreaSearch::ObjectData* get_obj_data(const LLUUID& id)
{
auto areasearch = JCFloaterAreaSearch::findInstance();
return areasearch ? areasearch->getObjectData(id) : nullptr;
}
const std::string get_slurl_for(const LLUUID& id, const LFIDBearer::Type& type) const std::string get_slurl_for(const LLUUID& id, const LFIDBearer::Type& type)
{ {
switch (type) switch (type)
@@ -9050,10 +9056,7 @@ const std::string get_slurl_for(const LLUUID& id, const LFIDBearer::Type& type)
case LFIDBearer::AVATAR: return LLAvatarActions::getSLURL(id); case LFIDBearer::AVATAR: return LLAvatarActions::getSLURL(id);
case LFIDBearer::OBJECT: case LFIDBearer::OBJECT:
{ {
auto areasearch = JCFloaterAreaSearch::findInstance(); const auto& obj_data = get_obj_data(id);
if (!areasearch) return LLStringUtil::null;
const auto& obj_data = areasearch->getObjectData(id);
if (!obj_data) return LLStringUtil::null; if (!obj_data) return LLStringUtil::null;
LLSD sdQuery; LLSD sdQuery;