diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2025-09-22 15:46:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-22 15:46:04 +0300 |
| commit | d7bd769129100332791569cbffa07f54d2fca991 (patch) | |
| tree | e6c70f27363fe436c7376c2440b76452d4787aa5 /indra/newview/llchathistory.cpp | |
| parent | 569d7c6a8b1e44b66dad16a3367547cdf3395620 (diff) | |
#4715 disable ZoomIn an object item when the region is not connected to the current region
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 2facc43811..c1af09ebc7 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -215,7 +215,8 @@ public: LLUUID obj_id = mObjectData["object_id"]; if (obj_id.notNull()) { - return nullptr != gObjectList.findObject(mAvatarID); + LLViewerObject* object = gObjectList.findObject(obj_id); + return object && object->isReachable(); } return false; } @@ -1118,7 +1119,11 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p) mEditor = LLUICtrlFactory::create<LLTextEditor>(editor_params, this); mEditor->setIsFriendCallback(LLAvatarActions::isFriend); mEditor->setIsObjectBlockedCallback(boost::bind(&LLMuteList::isMuted, LLMuteList::getInstance(), _1, _2, 0)); - + mEditor->setIsObjectReachableCallback([](const LLUUID& obj_id) + { + LLViewerObject* object = gObjectList.findObject(obj_id); + return object && object->isReachable(); + }); } LLSD LLChatHistory::getValue() const |