diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 1870a72ae2244c5ca78b3e25b08b6e8f0f97eceb..35803e7249760210d046fd82f0b48b8c1f8ea525 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 b99ca674a3163575cc7b925aabad2f8fe191195c..2ea503c033a0193728d2c36718691c2102f7c447 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();