From bf5035388b33b1400b18ae5f9f0ea707ba034f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Wed, 8 Jan 2020 19:22:36 -0500 Subject: [PATCH] Expose ObjectData from AreaSearch --- indra/newview/jcfloaterareasearch.h | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/indra/newview/jcfloaterareasearch.h b/indra/newview/jcfloaterareasearch.h index 32c40c253..033dc22ad 100644 --- a/indra/newview/jcfloaterareasearch.h +++ b/indra/newview/jcfloaterareasearch.h @@ -56,6 +56,20 @@ public: void results(); static void processObjectPropertiesFamily(LLMessageSystem* msg, void** user_data); + struct ObjectData + { + LLUUID id; + std::string name; + std::string desc; + LLUUID owner_id; + LLUUID group_id; + }; + + const ObjectData* getObjectData(const LLUUID& id) const + { + const auto& it = mCachedObjects.find(id); + return it != mCachedObjects.end() ? &it->second : nullptr; + } private: @@ -84,14 +98,6 @@ private: LLViewerRegion* mLastRegion; bool mStopped; - struct ObjectData - { - LLUUID id; - std::string name; - std::string desc; - LLUUID owner_id; - LLUUID group_id; - }; uuid_set_t mPendingObjects; boost::unordered_map mCachedObjects;