diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 441197c3ff937f3a62262601cca33fd15865fc38..58103cf483fda6740b7be6f8bd21ad498a47e262 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -40,6 +40,8 @@
 #include "llbutton.h"
 #include "llcallingcard.h"
 #include "llcombobox.h"
+#include "llcheckboxctrl.h"
+#include "llsliderctrl.h"
 #include "llviewercontrol.h"
 #include "llcommandhandler.h"
 #include "lldraghandle.h"
@@ -292,7 +294,26 @@ void* LLFloaterWorldMap::createWorldMapView(void* data)
 BOOL LLFloaterWorldMap::postBuild()
 {
     mMapView = dynamic_cast<LLWorldMapView*>(getChild<LLPanel>("objects_mapview"));
+
+	mTeleportButton = getChild<LLButton>("Teleport");
+	mShowDestinationButton = getChild<LLButton>("Show Destination");
+	mCopySlurlButton = getChild<LLButton>("copy_slurl");
 	mTrackRegionButton = getChild<LLButton>("track_region");
+	mGoHomeButton = getChild<LLButton>("Go Home");
+
+	mPeopleCheck = getChild<LLCheckBoxCtrl>("people_chk");
+	mInfohubCheck = getChild<LLCheckBoxCtrl>("infohub_chk");
+	mTelehubCheck = getChild<LLCheckBoxCtrl>("telehub_chk");
+	mLandSaleCheck = getChild<LLCheckBoxCtrl>("land_for_sale_chk");
+	mEventsCheck = getChild<LLCheckBoxCtrl>("event_chk");
+	mEventsMatureCheck = getChild<LLCheckBoxCtrl>("events_mature_chk");
+	mEventsAdultCheck = getChild<LLCheckBoxCtrl>("events_adult_chk");
+
+	mAvatarIcon = getChild<LLUICtrl>("avatar_icon");
+	mLandmarkIcon = getChild<LLUICtrl>("landmark_icon");
+	mLocationIcon = getChild<LLUICtrl>("location_icon");
+
+	mZoomSlider = getChild<LLSliderCtrl>("zoom slider");
 	
 	LLComboBox *avatar_combo = getChild<LLComboBox>("friend combo");
 	avatar_combo->selectFirstItem();
@@ -314,7 +335,7 @@ BOOL LLFloaterWorldMap::postBuild()
 	mListLandmarkCombo = dynamic_cast<LLCtrlListInterface *>(landmark_combo);
 	
     F32 slider_zoom = mMapView->getZoom();
-    getChild<LLUICtrl>("zoom slider")->setValue(slider_zoom);
+    mZoomSlider->setValue(slider_zoom);
     
     //getChild<LLPanel>("expand_btn_panel")->setMouseDownCallback(boost::bind(&LLFloaterWorldMap::onExpandCollapseBtn, this));
 	
@@ -429,9 +450,9 @@ BOOL LLFloaterWorldMap::handleScrollWheel(S32 x, S32 y, S32 clicks)
         S32 map_y = y - mMapView->getRect().mBottom;
         if (mMapView->pointInView(map_x, map_y))
         {
-            F32 old_slider_zoom = (F32) getChild<LLUICtrl>("zoom slider")->getValue().asReal();
+            F32 old_slider_zoom = (F32) mZoomSlider->getValue().asReal();
             F32 slider_zoom     = old_slider_zoom + ((F32) clicks * -0.3333f);
-            getChild<LLUICtrl>("zoom slider")->setValue(LLSD(slider_zoom));
+            mZoomSlider->setValue(LLSD(slider_zoom));
             mMapView->zoomWithPivot(slider_zoom, map_x, map_y);
             return true;
         }
@@ -460,32 +481,34 @@ void LLFloaterWorldMap::draw()
 	LLViewerRegion* regionp = gAgent.getRegion();
 	bool agent_on_prelude = (regionp && regionp->isPrelude());
 	bool enable_go_home = gAgent.isGodlike() || !agent_on_prelude;
-	getChildView("Go Home")->setEnabled(enable_go_home);
-	
+// [RLVa:KB] - Checked: 2010-08-22 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
+	mGoHomeButton->setEnabled(enable_go_home && (!rlv_handler_t::isEnabled()) || !(gRlvHandler.hasBehaviour(RLV_BHVR_TPLM) && gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC)));
+// [/RLVa:KB]
+
 	updateLocation();
 	
 	LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus(); 
 	if (LLTracker::TRACKING_AVATAR == tracking_status)
 	{
-		getChild<LLUICtrl>("avatar_icon")->setColor( map_track_color);
+		mAvatarIcon->setColor( map_track_color);
 	}
 	else
 	{
-		getChild<LLUICtrl>("avatar_icon")->setColor( map_track_disabled_color);
+		mAvatarIcon->setColor( map_track_disabled_color);
 	}
 	
 	if (LLTracker::TRACKING_LANDMARK == tracking_status)
 	{
-		getChild<LLUICtrl>("landmark_icon")->setColor( map_track_color);
+		mLandmarkIcon->setColor( map_track_color);
 	}
 	else
 	{
-		getChild<LLUICtrl>("landmark_icon")->setColor( map_track_disabled_color);
+		mLandmarkIcon->setColor( map_track_disabled_color);
 	}
 	
 	if (LLTracker::TRACKING_LOCATION == tracking_status)
 	{
-		getChild<LLUICtrl>("location_icon")->setColor( map_track_color);
+		mLocationIcon->setColor( map_track_color);
 	}
 	else
 	{
@@ -495,11 +518,11 @@ void LLFloaterWorldMap::draw()
 			double value = fmod(seconds, 2);
 			value = 0.5 + 0.5*cos(value * F_PI);
 			LLColor4 loading_color(0.0, F32(value/2), F32(value), 1.0);
-			getChild<LLUICtrl>("location_icon")->setColor( loading_color);
+			mLocationIcon->setColor( loading_color);
 		}
 		else
 		{
-			getChild<LLUICtrl>("location_icon")->setColor( map_track_disabled_color);
+			mLocationIcon->setColor( map_track_disabled_color);
 		}
 	}
 	
@@ -509,32 +532,28 @@ void LLFloaterWorldMap::draw()
 		centerOnTarget(TRUE);
 	}
 	
-	getChildView("Teleport")->setEnabled((BOOL)tracking_status);
+	mTeleportButton->setEnabled((BOOL)tracking_status);
 	//	getChildView("Clear")->setEnabled((BOOL)tracking_status);
-	getChildView("Show Destination")->setEnabled((BOOL)tracking_status || LLWorldMap::getInstance()->isTracking());
-	getChildView("copy_slurl")->setEnabled((mSLURL.isValid()) );
+	mShowDestinationButton->setEnabled((BOOL)tracking_status || LLWorldMap::getInstance()->isTracking());
+	mCopySlurlButton->setEnabled((mSLURL.isValid()) );
 	mTrackRegionButton->setEnabled((BOOL) tracking_status || LLWorldMap::getInstance()->isTracking());
-// [RLVa:KB] - Checked: 2010-08-22 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
-	childSetEnabled("Go Home", 
-		(!rlv_handler_t::isEnabled()) || !(gRlvHandler.hasBehaviour(RLV_BHVR_TPLM) && gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC)));
-// [/RLVa:KB]
 	
 	setMouseOpaque(TRUE);
 	getDragHandle()->setMouseOpaque(TRUE);
 
-    mMapView->zoom((F32)getChild<LLUICtrl>("zoom slider")->getValue().asReal());
+    mMapView->zoom((F32)mZoomSlider->getValue().asReal());
 	
 	// Enable/disable checkboxes depending on the zoom level
 	// If above threshold level (i.e. low res) -> Disable all checkboxes
 	// If under threshold level (i.e. high res) -> Enable all checkboxes
     bool enable = mMapView->showRegionInfo();
-	getChildView("people_chk")->setEnabled(enable);
-	getChildView("infohub_chk")->setEnabled(enable);
-	getChildView("telehub_chk")->setEnabled(enable);
-	getChildView("land_for_sale_chk")->setEnabled(enable);
-	getChildView("event_chk")->setEnabled(enable);
-	getChildView("events_mature_chk")->setEnabled(enable);
-	getChildView("events_adult_chk")->setEnabled(enable);
+	mPeopleCheck->setEnabled(enable);
+	mInfohubCheck->setEnabled(enable);
+	mTelehubCheck->setEnabled(enable);
+	mLandSaleCheck->setEnabled(enable);
+	mEventsCheck->setEnabled(enable);
+	mEventsMatureCheck->setEnabled(enable);
+	mEventsAdultCheck->setEnabled(enable);
 	
 	LLFloater::draw();
 }
@@ -572,7 +591,7 @@ void LLFloaterWorldMap::trackAvatar( const LLUUID& avatar_id, const std::string&
 	{
 		LLTracker::stopTracking(false);
 	}
-	setDefaultBtn("Teleport");
+	setDefaultBtn(mTeleportButton);
 }
 
 void LLFloaterWorldMap::trackLandmark( const LLUUID& landmark_item_id )
@@ -616,7 +635,7 @@ void LLFloaterWorldMap::trackLandmark( const LLUUID& landmark_item_id )
 	{
 		LLTracker::stopTracking(false);
 	}
-	setDefaultBtn("Teleport");
+	setDefaultBtn(mTeleportButton);
 }
 
 
@@ -624,14 +643,14 @@ void LLFloaterWorldMap::trackEvent(const LLItemInfo &event_info)
 {
 	mTrackedStatus = LLTracker::TRACKING_LOCATION;
 	LLTracker::trackLocation(event_info.getGlobalPosition(), event_info.getName(), event_info.getToolTip(), LLTracker::LOCATION_EVENT);
-	setDefaultBtn("Teleport");
+	setDefaultBtn(mTeleportButton);
 }
 
 void LLFloaterWorldMap::trackGenericItem(const LLItemInfo &item)
 {
 	mTrackedStatus = LLTracker::TRACKING_LOCATION;
 	LLTracker::trackLocation(item.getGlobalPosition(), item.getName(), item.getToolTip(), LLTracker::LOCATION_ITEM);
-	setDefaultBtn("Teleport");
+	setDefaultBtn(mTeleportButton);
 }
 
 void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
@@ -692,7 +711,7 @@ void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
 	// we have a valid region - turn on coord display
 	enableTeleportCoordsDisplay( true );
 	
-	setDefaultBtn("Teleport");
+	setDefaultBtn(mTeleportButton);
 }
 
 // enable/disable teleport destination coordinates 
@@ -864,7 +883,7 @@ void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S3
 		local_pos.mV[VZ] = (F32)z_coord;
 		LLVector3d global_pos = sim_info->getGlobalPos(local_pos);
 		trackLocation(global_pos);
-		setDefaultBtn("Teleport");
+		setDefaultBtn(mTeleportButton);
 	}
 	else
 	{
@@ -1111,7 +1130,7 @@ void LLFloaterWorldMap::adjustZoomSliderBounds()
 	
 	F32 min_power = log(pixels_per_region/256.f)/log(2.f);
 	
-	getChild<LLSliderCtrl>("zoom slider")->setMinValue(min_power);
+	mZoomSlider->setMinValue(min_power);
 }
 
 
@@ -1727,7 +1746,7 @@ void LLFloaterWorldMap::onCommitSearchResult()
 			
 			getChild<LLUICtrl>("location")->setValue(sim_name);
 			trackLocation(pos_global);
-			setDefaultBtn("Teleport");
+			setDefaultBtn(mTeleportButton);
 			break;
 		}
 	}
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
index b640dc5eec764e1f2fbb5fe293740cfc745edc5c..a702ab5145b24e3fe688b0af61792ac661017823 100644
--- a/indra/newview/llfloaterworldmap.h
+++ b/indra/newview/llfloaterworldmap.h
@@ -45,6 +45,9 @@ class LLItemInfo;
 class LLLineEditor;
 class LLTabContainer;
 class LLWorldMapView;
+class LLButton;
+class LLCheckBoxCtrl;
+class LLSliderCtrl;
 
 class LLFloaterWorldMap final : public LLFloater
 {
@@ -196,7 +199,25 @@ class LLFloaterWorldMap final : public LLFloater
 	LLCtrlListInterface *	mListLandmarkCombo;
 	LLCtrlListInterface *	mListSearchResults;
 
-	LLButton*				mTrackRegionButton;
+	LLButton*				mTeleportButton = nullptr;
+	LLButton*				mShowDestinationButton = nullptr;
+	LLButton*				mCopySlurlButton = nullptr;
+	LLButton*				mTrackRegionButton = nullptr;
+	LLButton*				mGoHomeButton = nullptr;
+
+	LLCheckBoxCtrl*			mPeopleCheck = nullptr;
+	LLCheckBoxCtrl*			mInfohubCheck = nullptr;
+	LLCheckBoxCtrl*			mTelehubCheck = nullptr;
+	LLCheckBoxCtrl*			mLandSaleCheck = nullptr;
+	LLCheckBoxCtrl*			mEventsCheck = nullptr;
+	LLCheckBoxCtrl*			mEventsMatureCheck = nullptr;
+	LLCheckBoxCtrl*			mEventsAdultCheck = nullptr;
+
+	LLUICtrl*				mAvatarIcon = nullptr;
+	LLUICtrl*				mLandmarkIcon = nullptr;
+	LLUICtrl*				mLocationIcon = nullptr;
+
+	LLSliderCtrl*				mZoomSlider = nullptr;
 
     boost::signals2::connection mTeleportFinishConnection;
 };
diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp
index 3a4fc613b7b08037d4ccaba0a37bc39c9f90ffce..e6aff67734ed8e62e8e247db1feaf09673aaf985 100644
--- a/indra/newview/llpanelblockedlist.cpp
+++ b/indra/newview/llpanelblockedlist.cpp
@@ -94,16 +94,21 @@ BOOL LLPanelBlockedList::postBuild()
 		break;
 	}
 
+	mBlockedGearBtn = getChild<LLMenuButton>("blocked_gear_btn");
+
 	// Use the context menu of the Block list for the Block tab gear menu.
 	LLToggleableMenu* blocked_gear_menu = mBlockedList->getContextMenu();
 	if (blocked_gear_menu)
 	{
-		getChild<LLMenuButton>("blocked_gear_btn")->setMenu(blocked_gear_menu, LLMenuButton::MP_BOTTOM_LEFT);
+		mBlockedGearBtn->setMenu(blocked_gear_menu, LLMenuButton::MP_BOTTOM_LEFT);
 	}
+	mUnblockBtn = getChild<LLButton>("unblock_btn");
+	mUnblockBtn->setCommitCallback(boost::bind(&LLPanelBlockedList::unblockItem, this));
 
-	getChild<LLButton>("unblock_btn")->setCommitCallback(boost::bind(&LLPanelBlockedList::unblockItem, this));
 	getChild<LLFilterEditor>("blocked_filter_input")->setCommitCallback(boost::bind(&LLPanelBlockedList::onFilterEdit, this, _2));
 
+	mBlockLimitText = getChild<LLUICtrl>("block_limit");
+
 	return LLPanel::postBuild();
 }
 
@@ -140,11 +145,12 @@ void LLPanelBlockedList::showPanelAndSelect(const LLUUID& idToSelect)
 void LLPanelBlockedList::updateButtons()
 {
 	bool hasSelected = NULL != mBlockedList->getSelectedItem();
-	getChildView("unblock_btn")->setEnabled(hasSelected);
-	getChildView("blocked_gear_btn")->setEnabled(hasSelected);
+	mUnblockBtn->setEnabled(hasSelected);
+	mBlockedGearBtn->setEnabled(hasSelected);
 
-	getChild<LLUICtrl>("block_limit")->setTextArg("[COUNT]", llformat("%d", mBlockedList->getMuteListSize()));
-	getChild<LLUICtrl>("block_limit")->setTextArg("[LIMIT]", llformat("%d", gSavedSettings.getS32("MuteListLimit")));
+	static LLCachedControl<S32> mute_list_limit(gSavedSettings, "MuteListLimit");
+	mBlockLimitText->setTextArg("[COUNT]", llformat("%d", mBlockedList->getMuteListSize()));
+	mBlockLimitText->setTextArg("[LIMIT]", llformat("%d", mute_list_limit()));
 }
 
 void LLPanelBlockedList::unblockItem()
diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h
index 652aa0fbe92b69d4ecf1ef535ae2015d86ecbc4b..8339cf16b3ae1c752e1b9e088ac823ff20a081fe 100644
--- a/indra/newview/llpanelblockedlist.h
+++ b/indra/newview/llpanelblockedlist.h
@@ -33,6 +33,8 @@
 
 class LLAvatarName;
 class LLBlockList;
+class LLMenuButton;
+class LLButton;
 
 class LLPanelBlockedList : public LLPanel
 {
@@ -78,7 +80,10 @@ class LLPanelBlockedList : public LLPanel
 	static void callbackBlockByName(const std::string& text);
 
 private:
-	LLBlockList* mBlockedList;
+	LLBlockList* mBlockedList = nullptr;
+	LLUICtrl*	 mBlockLimitText = nullptr;
+	LLMenuButton* mBlockedGearBtn = nullptr;
+	LLButton*	 mUnblockBtn = nullptr;
     LLHandle<LLFloater> mPicker;
 };