From a5d7a272d54d9ed3c18698aade9b1fadfee09194 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 10 Jun 2024 14:24:08 -0400
Subject: [PATCH] Fix some gcc warnings
---
indra/newview/llviewerparcelmgr.cpp | 2 ++
indra/newview/rlvhandler.cpp | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 1870a72ae22..35803e72497 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1598,11 +1598,13 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
if(msg_region)
parcel_mgr.mParcelsPerEdge = S32(msg_region->getWidth() / PARCEL_GRID_STEP_METERS);
else
+ {
if (!gAgent.getRegion())
{
return;
}
parcel_mgr.mParcelsPerEdge = S32(gAgent.getRegion()->getWidth() / PARCEL_GRID_STEP_METERS);
+ }
msg->getS32Fast(_PREHASH_ParcelData, _PREHASH_RequestResult, request_result);
msg->getS32Fast(_PREHASH_ParcelData, _PREHASH_SequenceID, sequence_id);
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index b99ca674a31..2ea503c033a 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -2725,16 +2725,16 @@ void RlvBehaviourToggleHandler<RLV_BHVR_SHOWNEARBY>::onCommandToggle(ERlvBehavio
pPeoplePanel->updateNearbyList();
}
+#ifdef CATZNIP
// Refresh the nearby participant list
if (LLFloaterIMNearbyChat* pNearbyChatFloater = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))
{
-#ifdef CATZNIP
+
pNearbyChatFloater->updateShowParticipantList();
pNearbyChatFloater->updateExpandCollapseBtn();
-#else
// *TODO - Solution for CHUI
-#endif // CATZNIP
}
+#endif // CATZNIP
// Refresh that avatar's name tag and all HUD text
LLHUDText::refreshAllObjectText();
--
GitLab