diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml
index dfaaf07af..900103fa9 100644
--- a/indra/newview/app_settings/settings_ascent.xml
+++ b/indra/newview/app_settings/settings_ascent.xml
@@ -47,6 +47,17 @@
 		  <key>Value</key>
 		  <integer>1</integer>
 		</map>
+		<key>IMNameSystem</key>
+		<map>
+		  <key>Comment</key>
+		  <string>For names in chat tabs. 0 = Old Style, 1 = Display Names and Username, 2 = Displayname only, 3 = Old Style (Display Name)</string>
+		  <key>Persist</key>
+		  <integer>1</integer>
+		  <key>Type</key>
+		  <string>S32</string>
+		  <key>Value</key>
+		  <integer>0</integer>
+		</map>
 		<key>LandManagementNameSystem</key>
 		<map>
 		  <key>Comment</key>
diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp
index 8862d1604..c604a3260 100644
--- a/indra/newview/ascentprefschat.cpp
+++ b/indra/newview/ascentprefschat.cpp
@@ -265,6 +265,7 @@ void LLPrefsAscentChat::refreshValues()
 	mLegacyEndScroll                = gSavedSettings.getBOOL("LiruLegacyScrollToEnd");
 	mItalicizeActions               = gSavedSettings.getBOOL("LiruItalicizeActions");
 	mLegacyLogLaunch                = gSavedSettings.getBOOL("LiruLegacyLogLaunch");
+	mChatTabNames                   = gSavedSettings.getS32("IMNameSystem");
 	mFriendNames                    = gSavedSettings.getS32("FriendNameSystem");
 	mGroupMembersNames              = gSavedSettings.getS32("GroupMembersNameSystem");
 	mLandManagementNames            = gSavedSettings.getS32("LandManagementNameSystem");
@@ -348,6 +349,8 @@ void LLPrefsAscentChat::refresh()
     }
 
 	//Chat UI -----------------------------------------------------------------------------
+	if (combo = getChild<LLComboBox>("chat_tabs_namesystem_combobox"))
+		combo->setCurrentByIndex(mChatTabNames);
 	if (combo = getChild<LLComboBox>("friends_namesystem_combobox"))
 		combo->setCurrentByIndex(mFriendNames);
 	if (combo = getChild<LLComboBox>("group_members_namesystem_combobox"))
@@ -501,6 +504,7 @@ void LLPrefsAscentChat::cancel()
 	gSavedSettings.setBOOL("LiruLegacyScrollToEnd",                mLegacyEndScroll);
 	gSavedSettings.setBOOL("LiruItalicizeActions",                 mItalicizeActions);
 	gSavedSettings.setBOOL("LiruLegacyLogLaunch",                  mLegacyLogLaunch);
+	gSavedSettings.setS32("IMNameSystem",                          mChatTabNames);
 	gSavedSettings.setS32("FriendNameSystem",                      mFriendNames);
 	gSavedSettings.setS32("GroupMembersNameSystem",                mGroupMembersNames);
 	gSavedSettings.setS32("LandManagementNameSystem",              mLandManagementNames);
diff --git a/indra/newview/ascentprefschat.h b/indra/newview/ascentprefschat.h
index c04a2d297..709635d4f 100644
--- a/indra/newview/ascentprefschat.h
+++ b/indra/newview/ascentprefschat.h
@@ -87,6 +87,7 @@ private:
 	bool mLegacyEndScroll;
 	bool mItalicizeActions;
 	bool mLegacyLogLaunch;
+	S32 mChatTabNames;
 	S32 mFriendNames;
 	S32 mGroupMembersNames;
 	S32 mLandManagementNames;
diff --git a/indra/newview/lfsimfeaturehandler.cpp b/indra/newview/lfsimfeaturehandler.cpp
index 0935bdb8b..8eff5fb70 100644
--- a/indra/newview/lfsimfeaturehandler.cpp
+++ b/indra/newview/lfsimfeaturehandler.cpp
@@ -87,6 +87,11 @@ void LFSimFeatureHandler::setSupportedFeatures()
 				has_feature_or_default(mDestinationGuideURL, extras, "destination-guide-url");
 				mMapServerURL = extras.has("map-server-url") ? extras["map-server-url"].asString() : "";
 				has_feature_or_default(mSearchURL, extras, "search-server-url");
+				if (extras.has("GridName"))
+				{
+					const std::string& grid_name(extras["GridName"]);
+					mGridName = gHippoGridManager->getConnectedGrid()->getGridName() != grid_name ? grid_name : "";
+				}
 			}
 			has_feature_or_default(mSayRange, extras, "say-range");
 			has_feature_or_default(mShoutRange, extras, "shout-range");
@@ -115,6 +120,7 @@ void LFSimFeatureHandler::setSupportedFeatures()
 				mDestinationGuideURL.reset();
 				mMapServerURL = "";
 				mSearchURL.reset();
+				mGridName.reset();
 			}
 			mSayRange.reset();
 			mShoutRange.reset();
@@ -133,42 +139,3 @@ void LFSimFeatureHandler::resetSpecialFloaters()
 	mSpecialFloaters.clear();
 }
 
-boost::signals2::connection LFSimFeatureHandler::setSupportsExportCallback(const SignaledType<bool>::slot_t& slot)
-{
-	return mSupportsExport.connect(slot);
-}
-
-boost::signals2::connection LFSimFeatureHandler::setDestinationGuideURLCallback(const SignaledType<std::string>::slot_t& slot)
-{
-	return mDestinationGuideURL.connect(slot);
-}
-
-boost::signals2::connection LFSimFeatureHandler::setSearchURLCallback(const SignaledType<std::string>::slot_t& slot)
-{
-	return mSearchURL.connect(slot);
-}
-
-boost::signals2::connection LFSimFeatureHandler::setSayRangeCallback(const SignaledType<U32>::slot_t& slot)
-{
-	return mSayRange.connect(slot);
-}
-
-boost::signals2::connection LFSimFeatureHandler::setShoutRangeCallback(const SignaledType<U32>::slot_t& slot)
-{
-	return mShoutRange.connect(slot);
-}
-
-boost::signals2::connection LFSimFeatureHandler::setWhisperRangeCallback(const SignaledType<U32>::slot_t& slot)
-{
-	return mWhisperRange.connect(slot);
-}
-
-boost::signals2::connection LFSimFeatureHandler::setOnLookMaskCallback(const SignaledType<U8>::slot_t& slot)
-{
-	return mOnLookMask.connect(slot);
-}
-
-boost::signals2::connection LFSimFeatureHandler::setSpecialUICallback(const SignaledType<std::string>::slot_t& slot)
-{
-	return mSpecialUI.connect(slot);
-}
diff --git a/indra/newview/lfsimfeaturehandler.h b/indra/newview/lfsimfeaturehandler.h
index ec8ba7ffc..a5967c702 100644
--- a/indra/newview/lfsimfeaturehandler.h
+++ b/indra/newview/lfsimfeaturehandler.h
@@ -41,6 +41,7 @@ public:
 		return *this;
 	}
 	operator Type() const { return mValue; }
+	const Type& ref() const { return mValue; }
 	void reset() { *this = mDefaultValue; }
 	const Type& getDefault() const { return mDefaultValue; }
 
@@ -61,24 +62,25 @@ public:
 	void setSupportedFeatures();
 
 	// Connection setters
-	boost::signals2::connection setSupportsExportCallback(const SignaledType<bool>::slot_t& slot);
-	boost::signals2::connection setDestinationGuideURLCallback(const SignaledType<std::string>::slot_t& slot);
-	boost::signals2::connection setSearchURLCallback(const SignaledType<std::string>::slot_t& slot);
-	boost::signals2::connection setSayRangeCallback(const SignaledType<U32>::slot_t& slot);
-	boost::signals2::connection setShoutRangeCallback(const SignaledType<U32>::slot_t& slot);
-	boost::signals2::connection setWhisperRangeCallback(const SignaledType<U32>::slot_t& slot);
-	boost::signals2::connection setOnLookMaskCallback(const SignaledType<U8>::slot_t& slot);
-	boost::signals2::connection setSpecialUICallback(const SignaledType<std::string>::slot_t& slot);
+	boost::signals2::connection setSupportsExportCallback(const SignaledType<bool>::slot_t& slot) { return mSupportsExport.connect(slot); }
+	boost::signals2::connection setDestinationGuideURLCallback(const SignaledType<std::string>::slot_t& slot) { return mDestinationGuideURL.connect(slot); }
+	boost::signals2::connection setSearchURLCallback(const SignaledType<std::string>::slot_t& slot) { return mSearchURL.connect(slot); }
+	boost::signals2::connection setSayRangeCallback(const SignaledType<U32>::slot_t& slot) { return mSayRange.connect(slot); }
+	boost::signals2::connection setShoutRangeCallback(const SignaledType<U32>::slot_t& slot) { return mShoutRange.connect(slot); }
+	boost::signals2::connection setWhisperRangeCallback(const SignaledType<U32>::slot_t& slot) { return mWhisperRange.connect(slot); }
+	boost::signals2::connection setOnLookMaskCallback(const SignaledType<U8>::slot_t& slot) { return mOnLookMask.connect(slot); }
+	boost::signals2::connection setSpecialUICallback(const SignaledType<std::string>::slot_t& slot) { return mSpecialUI.connect(slot); }
 
 	// Accessors
 	bool simSupportsExport() const { return mSupportsExport; }
 	std::string destinationGuideURL() const { return mDestinationGuideURL; }
 	std::string mapServerURL() const { return mMapServerURL; }
 	std::string searchURL() const { return mSearchURL; }
+	const std::string& gridName() const { return mGridName.ref(); }
 	U32 sayRange() const { return mSayRange; }
 	U32 shoutRange() const { return mShoutRange; }
 	U32 whisperRange() const { return mWhisperRange; }
-	U8 getOnLookMask() const { return mOnLookMask; }
+	const U8& getOnLookMask() const { return mOnLookMask.ref(); }
 	const LLSD& specialFloaters() const { return mSpecialFloaters; }
 	ExportPolicy exportPolicy() const;
 
@@ -93,6 +95,7 @@ private:
 	SignaledType<std::string> mDestinationGuideURL;
 	std::string mMapServerURL;
 	SignaledType<std::string> mSearchURL;
+	SignaledType<std::string> mGridName;
 	SignaledType<U32> mSayRange;
 	SignaledType<U32> mShoutRange;
 	SignaledType<U32> mWhisperRange;
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index da0f11280..ccc13b61c 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -404,7 +404,17 @@ void LLFloaterIMPanel::onAvatarNameLookup(const LLAvatarName& avatar_name)
 	std::string title;
 	LLAvatarNameCache::getPNSName(avatar_name, title);
 	setTitle(title);
-	// Singu Note: We could set tab name here, too now.
+	const S32& ns(gSavedSettings.getS32("IMNameSystem"));
+	LLAvatarNameCache::getPNSName(avatar_name, title, ns);
+	if (!ns || ns == 3) // Remove Resident, if applicable.
+	{
+		size_t pos(title.find(" Resident"));
+		if (pos != std::string::npos && !gSavedSettings.getBOOL("LiruShowLastNameResident"))
+			title.erase(pos, 9);
+	}
+	setShortTitle(title);
+	if (LLMultiFloater* mf = dynamic_cast<LLMultiFloater*>(getParent()))
+		mf->updateFloaterTitle(this);
 }
 
 LLFloaterIMPanel::~LLFloaterIMPanel()
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 252ee313c..2d76ba707 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -92,6 +92,7 @@
 #include <iomanip>
 
 #include "hippogridmanager.h"
+#include "lfsimfeaturehandler.h"
 
 // [RLVa:KB]
 #include "rlvactions.h"
@@ -528,48 +529,26 @@ void LLStatusBar::refresh()
 	else mBuyLand->setVisible(false);
 
 	std::string location_name;
-	if (region)
+	if (region && parcel)
 	{
-		const LLVector3& agent_pos_region = gAgent.getPositionAgent();
-		S32 pos_x = lltrunc( agent_pos_region.mV[VX] );
-		S32 pos_y = lltrunc( agent_pos_region.mV[VY] );
-		S32 pos_z = lltrunc( agent_pos_region.mV[VZ] );
-
-		// Round the numbers based on the velocity
-		LLVector3 agent_velocity = gAgent.getVelocity();
-		F32 velocity_mag_sq = agent_velocity.magVecSquared();
-
-		const F32 FLY_CUTOFF = 6.f;		// meters/sec
-		const F32 FLY_CUTOFF_SQ = FLY_CUTOFF * FLY_CUTOFF;
-		const F32 WALK_CUTOFF = 1.5f;	// meters/sec
-		const F32 WALK_CUTOFF_SQ = WALK_CUTOFF * WALK_CUTOFF;
-
-		if (velocity_mag_sq > FLY_CUTOFF_SQ)
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Modified: RLVa-1.0.0a
+		if (RlvActions::hasBehaviour(RLV_BHVR_SHOWLOC))
 		{
-			pos_x -= pos_x % 4;
-			pos_y -= pos_y % 4;
-		}
-		else if (velocity_mag_sq > WALK_CUTOFF_SQ)
-		{
-			pos_x -= pos_x % 2;
-			pos_y -= pos_y % 2;
-		}
-
-		if (parcel)
-		{
-			if (!LLAgentUI::buildLocationString(location_name, LLAgentUI::LOCATION_FORMAT_FULL)) 
-			{
-				location_name = "???";
-			}
+			location_name = llformat("%s (%s) - %s",
+					RlvStrings::getString(RLV_STRING_HIDDEN_REGION).c_str(), region->getSimAccessString().c_str(), 
+					RlvStrings::getString(RLV_STRING_HIDDEN).c_str());
 		}
 		else
+// [/RLVa:KB]
+		if (!LLAgentUI::buildLocationString(location_name, LLAgentUI::LOCATION_FORMAT_FULL)) 
+			location_name = "???";
+		else
 		{
-			location_name = region->getName()
-				+ llformat(" %d, %d, %d (%s)", 
-						   pos_x, pos_y, pos_z,
-						   region->getSimAccessString().c_str());
+			const std::string& grid(LFSimFeatureHandler::instance().gridName());
+			if (!grid.empty()) location_name += ", " + grid;
 		}
-		static LLCachedControl<bool> show_channel("ShowSimChannel");
+
+		static const LLCachedControl<bool> show_channel("ShowSimChannel");
 		if (show_channel && !gLastVersionChannel.empty()) location_name += " - " + gLastVersionChannel;
 	}
 	else
@@ -578,15 +557,6 @@ void LLStatusBar::refresh()
 		location_name = "(Unknown)";
 	}
 
-// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Modified: RLVa-1.0.0a
-	if ( (region) && (RlvActions::hasBehaviour(RLV_BHVR_SHOWLOC)) )	// region == NULL if we lose our connection to the grid
-	{
-		location_name = llformat("%s (%s) - %s", 
-			RlvStrings::getString(RLV_STRING_HIDDEN_REGION).c_str(), region->getSimAccessString().c_str(), 
-			RlvStrings::getString(RLV_STRING_HIDDEN).c_str());
-	}
-// [/RLVa:KB]
-
 	mTextParcelName->setText(location_name);
 
 	// x = right edge
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
index 024f4d5e7..8199d3d8d 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -56,6 +56,13 @@
       <check_box bottom_delta="-20" follows="left|top" control_name="ShowLocalChatFloaterBar" label="Show chat bar in torn-off local chat floater" name="show_local_chat_floater_bar"/>
       <check_box bottom_delta="-20" control_name="ContactsUseHorizontalButtons" follows="top" height="16" label="Use horizontal buttons for contacts floater (Needs restart)" tool_tip="When enabled, the buttons on the Friends and Groups panels will be at the bottom, horizontally arranged, instead of vertically arranged on the right." name="horiz_butt"/>
       <text bottom_delta="-14" left="16" follows="top" name="namesystems_text_box">Format for names in lists of/for:</text>
+      <text bottom_delta="-18" left="20" follows="top" name="chat_tabs_namesystem_text_box">Chat Tabs:</text>
+      <combo_box bottom_delta="-5" left_delta="140" follows="top" height="18" control_name="IMNameSystem" name="chat_tabs_namesystem_combobox" width="130">
+        <combo_item name="Old Names" value="0">Old Names</combo_item>
+        <combo_item name="Display Names (with Username)" value="1">Display Names (w/Username)</combo_item>
+        <combo_item name="Display Names only" value="2">Display Names only</combo_item>
+        <combo_item name="Old Names (with Display Names)" value="3">Old Names (w/Display)</combo_item>
+      </combo_box>
       <text bottom_delta="-18" left="20" follows="top" name="friends_namesystem_text_box">Friends:</text>
       <combo_box bottom_delta="-5" left_delta="140" follows="top" height="18" control_name="FriendNameSystem" name="friends_namesystem_combobox" width="130">
         <combo_item name="Old Names" value="0">Old Names</combo_item>
diff --git a/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings.xml b/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings.xml
index 26b5e8643..f7e62c96f 100644
--- a/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings.xml
+++ b/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings.xml
@@ -3,7 +3,7 @@
      enabled="true" follows="left|bottom" height="20" left="0"
      name="Adv_Settings" use_bounding_rect="true" width="30" >
 	<panel bottom="1" filename="panel_bg_tab.xml" height="22" left="0" width="30" />
-	<button bottom="1" height="22" label=""
+	<button bottom="1" height="22" label="" image_overlay="arrow_up.tga"
 	     left="5" name="expand" scale_image="true" toggle="true"
 	     tool_tip="Show the Settings Panel" width="22" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml b/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
index 05a41ba18..6890e8e75 100644
--- a/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
+++ b/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
@@ -25,5 +25,5 @@
 	<check_box bottom_delta="0" left_delta="80" label="Crossfade?" control_name="PhoenixInterpolateSky" height="16" name="Crossfade" tool_tip="If unchecked, Sky Windlight settings changes will apply immediately, without hesitation/animation."/>
 	<icon bottom_delta="-18" height="14" image_name="icon_day_cycle.tga" left="10" width="150"/>
 	<slider bottom_delta="-8" control_name="EnvTimeSlider" left="5" height="10" increment="0.00000001" label="" max_val="1" min_val="0" name="EnvTimeSlider" show_text="false" width="160"/>
-	<button bottom="1" height="22" label="" left="172" name="expand" scale_image="true" toggle="true" tool_tip="Hide the Settings Panel" width="22"/>
+	<button bottom="1" height="22" label="" left="172" name="expand" scale_image="true" image_overlay="arrow_down.tga" toggle="true" tool_tip="Hide the Settings Panel" width="22"/>
 </panel>
diff --git a/indra/newview/wlfPanel_AdvSettings.cpp b/indra/newview/wlfPanel_AdvSettings.cpp
index 9ed6ea18e..bb40fb896 100644
--- a/indra/newview/wlfPanel_AdvSettings.cpp
+++ b/indra/newview/wlfPanel_AdvSettings.cpp
@@ -67,54 +67,40 @@ wlfPanel_AdvSettings::wlfPanel_AdvSettings() : mExpanded(false)
 //static
 void wlfPanel_AdvSettings::updateClass()
 {
-	if(!wlfPanel_AdvSettings::instanceExists())
-		return;
-	wlfPanel_AdvSettings::getInstance()->build(); 
+	if (!instanceExists()) return;
+	instance().build();
 }
 
 void wlfPanel_AdvSettings::build()
 {
 	mConnections.clear();
 	deleteAllChildren();
-	std::string ButtonState;
-	if (gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
-	{
-		mExpanded = true;
-		LLUICtrlFactory::getInstance()->buildPanel(this, "wlfPanel_AdvSettings_expanded.xml", &getFactoryMap());
-		ButtonState = "arrow_down.tga";
-	}
-	else
-	{
-		mExpanded = false;
-		LLUICtrlFactory::getInstance()->buildPanel(this, "wlfPanel_AdvSettings.xml", &getFactoryMap());
-		ButtonState = "arrow_up.tga";
-	}
-	getChild<LLButton>("expand")->setImageOverlay(ButtonState);
+	mExpanded = gSavedSettings.getBOOL("wlfAdvSettingsPopup");
+	LLUICtrlFactory::instance().buildPanel(this, mExpanded ? "wlfPanel_AdvSettings_expanded.xml" : "wlfPanel_AdvSettings.xml", &getFactoryMap());
 }
 
 // [RLVa:KB] - Checked: 2013-06-20
 void wlfPanel_AdvSettings::updateRlvVisibility()
 {
-	if(!mExpanded || !rlv_handler_t::isEnabled())
+	if (!mExpanded || !rlv_handler_t::isEnabled())
 		return;
 
 	bool enable = !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV);
 	childSetEnabled("use_estate_wl", enable);
 	childSetEnabled("EnvAdvancedWaterButton", enable);
-	childSetEnabled("WLWaterPresetsCombo", enable);
+	mWaterPresetCombo->setEnabled(enable);
 	childSetEnabled("WWprev", enable);
 	childSetEnabled("WWnext", enable);
 	childSetEnabled("EnvAdvancedSkyButton", enable);
-	childSetEnabled("WLSkyPresetsCombo", enable);
+	mSkyPresetCombo->setEnabled(enable);
 	childSetEnabled("WLprev", enable);
 	childSetEnabled("WLnext", enable);
-	childSetEnabled("EnvTimeSlider", enable);
+	mTimeSlider->setEnabled(enable);
 }
 
 void wlfPanel_AdvSettings::onRlvBehaviorChange(ERlvBehaviour eBhvr, ERlvParamType eType)
 {
-	if(eBhvr == RLV_BHVR_SETENV)
-		updateRlvVisibility();
+	if (eBhvr == RLV_BHVR_SETENV) updateRlvVisibility();
 }
 // [/RLVa:KB]
 
@@ -149,7 +135,8 @@ void wlfPanel_AdvSettings::refreshLists()
 BOOL wlfPanel_AdvSettings::postBuild()
 {
 	setVisible(true);
-	childSetAction("expand", onClickExpandBtn, this);
+	if (LLUICtrl* ctrl = findChild<LLUICtrl>("expand"))
+		ctrl->setCommitCallback(boost::bind(&wlfPanel_AdvSettings::onClickExpandBtn, this));
 
 	if (mExpanded)
 	{
@@ -208,9 +195,10 @@ wlfPanel_AdvSettings::~wlfPanel_AdvSettings ()
 {
 }
 
-void wlfPanel_AdvSettings::onClickExpandBtn(void* user_data)
+void wlfPanel_AdvSettings::onClickExpandBtn()
 {
-	gSavedSettings.setBOOL("wlfAdvSettingsPopup",!gSavedSettings.getBOOL("wlfAdvSettingsPopup"));
+	LLControlVariable* ctrl = gSavedSettings.getControl("wlfAdvSettingsPopup");
+	ctrl->set(!ctrl->get());
 }
 
 void wlfPanel_AdvSettings::onChangeCameraPreset(LLUICtrl* ctrl, const LLSD& param)
@@ -277,7 +265,7 @@ void wlfPanel_AdvSettings::onClickWWNext()
 		index = 0;
 	mWaterPresetCombo->setCurrentByIndex(index);
 
-	wlfPanel_AdvSettings::onChangeWWPresetName(mWaterPresetCombo->getSelectedValue());
+	onChangeWWPresetName(mWaterPresetCombo->getSelectedValue());
 }
 
 void wlfPanel_AdvSettings::onClickWWPrev()
@@ -288,7 +276,7 @@ void wlfPanel_AdvSettings::onClickWWPrev()
 	--index;
 	mWaterPresetCombo->setCurrentByIndex(index);
 
-	wlfPanel_AdvSettings::onChangeWWPresetName(mWaterPresetCombo->getSelectedValue());
+	onChangeWWPresetName(mWaterPresetCombo->getSelectedValue());
 }
 
 void wlfPanel_AdvSettings::onClickWLNext()
@@ -299,7 +287,7 @@ void wlfPanel_AdvSettings::onClickWLNext()
 		index = 0;
 	mSkyPresetCombo->setCurrentByIndex(index);
 
-	wlfPanel_AdvSettings::onChangeWLPresetName(mSkyPresetCombo->getSelectedValue());
+	onChangeWLPresetName(mSkyPresetCombo->getSelectedValue());
 }
 
 void wlfPanel_AdvSettings::onClickWLPrev()
@@ -310,13 +298,14 @@ void wlfPanel_AdvSettings::onClickWLPrev()
 	--index;
 	mSkyPresetCombo->setCurrentByIndex(index);
 
-	wlfPanel_AdvSettings::onChangeWLPresetName(mSkyPresetCombo->getSelectedValue());
+	onChangeWLPresetName(mSkyPresetCombo->getSelectedValue());
 }
 
 void wlfPanel_AdvSettings::onChangeDayTime(const LLSD& value)
 {
 	// deactivate animator
-	LLWLParamManager::getInstance()->mAnimator.deactivate();
+	LLWLParamManager& inst(LLWLParamManager::instance());
+	inst.mAnimator.deactivate();
 
 	F32 val = value.asFloat() + 0.25f;
 	if(val > 1.0)
@@ -324,8 +313,8 @@ void wlfPanel_AdvSettings::onChangeDayTime(const LLSD& value)
 		val--;
 	}
 
-	LLWLParamManager::getInstance()->mAnimator.setDayTime((F64)val);
-	LLWLParamManager::getInstance()->mAnimator.update(LLWLParamManager::getInstance()->mCurParams);
+	inst.mAnimator.setDayTime((F64)val);
+	inst.mAnimator.update(inst.mCurParams);
 }
 
 void wlfPanel_AdvSettings::populateWaterPresetsList()
diff --git a/indra/newview/wlfPanel_AdvSettings.h b/indra/newview/wlfPanel_AdvSettings.h
index 413b30cd6..17b2ddc9a 100644
--- a/indra/newview/wlfPanel_AdvSettings.h
+++ b/indra/newview/wlfPanel_AdvSettings.h
@@ -45,9 +45,9 @@ class LLSliderCtrl;
 class wlfPanel_AdvSettings : public LLPanel, public LLSingleton<wlfPanel_AdvSettings>
 {
 public:
-	wlfPanel_AdvSettings ();
+	wlfPanel_AdvSettings();
 	
-	~wlfPanel_AdvSettings ();
+	~wlfPanel_AdvSettings();
 	BOOL postBuild();
 	void draw();
 
@@ -56,7 +56,7 @@ public:
 
 	static void updateClass();
 
-	static void onClickExpandBtn(void* user_data);
+	void onClickExpandBtn();
 	void onChangeCameraPreset(LLUICtrl* ctrl, const LLSD& param);
 	void onChangeWWPresetName(const LLSD& value);
 	void onChangeWLPresetName(const LLSD& value);