From bee60da0899015d763b48419467a333e00b937a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Wed, 8 Jan 2020 20:43:47 -0500
Subject: [PATCH] Break out get_obj_data into its own function

---
 indra/newview/llviewermenu.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 2d406a237..5fb6ae779 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9042,6 +9042,12 @@ template<typename T> T* get_focused()
 	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)
 {
 	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::OBJECT:
 	{
-		auto areasearch = JCFloaterAreaSearch::findInstance();
-		if (!areasearch) return LLStringUtil::null;
-
-		const auto& obj_data = areasearch->getObjectData(id);
+		const auto& obj_data = get_obj_data(id);
 		if (!obj_data) return LLStringUtil::null;
 
 		LLSD sdQuery;