From cf57624688953138b34dfce1df6c5c080c0750c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Tue, 24 Mar 2020 22:41:23 -0400 Subject: [PATCH] Fix IsNearby check having invalid logic and hiding options because of it --- indra/newview/llviewermenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index b594fe3cd..b53ff3a73 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -9668,7 +9668,7 @@ class ListIsNearby final : public view_listener_t { const auto& data = userdata["data"]; const auto& id = active_owner_or_id(data); - gMenuHolder->findControl(userdata["control"].asString())->setValue(!data.asBoolean() && LFIDBearer::getActiveType() == LFIDBearer::OBJECT ? !!gObjectList.findObject(id) : is_nearby(id)); + gMenuHolder->findControl(userdata["control"].asString())->setValue((LFIDBearer::getActiveType() == LFIDBearer::OBJECT && data.asBoolean()) ? !!gObjectList.findObject(id) : is_nearby(id)); return true; } };