diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index cf9af9b32..1e257d4fa 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -1279,13 +1279,13 @@ void LLMenuItemBranchGL::updateBranchParent(LLView* parentp)
 	}
 }
 
-void LLMenuItemBranchGL::onVisibilityChange( BOOL new_visibility )
+void LLMenuItemBranchGL::handleVisibilityChange( BOOL new_visibility )
 {
 	if (new_visibility == FALSE && getBranch() && !getBranch()->getTornOff())
 	{
 		getBranch()->setVisible(FALSE);
 	}
-	LLMenuItemGL::onVisibilityChange(new_visibility);
+	LLMenuItemGL::handleVisibilityChange(new_visibility);
 }
 
 BOOL LLMenuItemBranchGL::handleKeyHere( KEY key, MASK mask )
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 63f9d555d..2150d5584 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -613,7 +613,7 @@ public:
 	virtual void updateBranchParent( LLView* parentp );
 
 	// LLView Functionality
-	virtual void onVisibilityChange( BOOL curVisibilityIn );
+	virtual void handleVisibilityChange( BOOL curVisibilityIn );
 
 	virtual void draw();
 
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 339e3b97c..6524f1856 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -644,14 +644,14 @@ void LLView::setVisible(BOOL visible)
 		if (!getParent() || getParent()->isInVisibleChain())
 		{
 			// tell all children of this view that the visibility may have changed
-			onVisibilityChange( visible );
+			handleVisibilityChange( visible );
 		}
 		updateBoundingRect();
 	}
 }
 
 // virtual
-void LLView::onVisibilityChange ( BOOL new_visibility )
+void LLView::handleVisibilityChange ( BOOL new_visibility )
 {
 	for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
 	{
@@ -659,7 +659,7 @@ void LLView::onVisibilityChange ( BOOL new_visibility )
 		// only views that are themselves visible will have their overall visibility affected by their ancestors
 		if (viewp->getVisible())
 		{
-			viewp->onVisibilityChange ( new_visibility );
+			viewp->handleVisibilityChange ( new_visibility );
 		}
 	}
 }
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 43ee36a4f..fa53862d1 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -94,7 +94,7 @@ virtual void	setEnabled(BOOL enabled)	{ mEnabled = enabled; }
 		LLCheckBoxCtrl, LLComboBox, LLLineEditor, LLMenuGL, LLRadioGroup, etc
 virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text ) { return FALSE; }
 		LLUICtrl, LLButton, LLCheckBoxCtrl, LLLineEditor, LLMenuGL, LLSliderCtrl
-virtual void	onVisibilityChange ( BOOL curVisibilityIn );
+virtual void	handleVisibilityChange ( BOOL curVisibilityIn );
 		LLMenuGL
 virtual LLRect getSnapRect() const	{ return mRect; } *TODO: Make non virtual
 		LLFloater
@@ -342,7 +342,7 @@ public:
 
 	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
 
-	virtual void	onVisibilityChange ( BOOL curVisibilityIn );
+	virtual void	handleVisibilityChange ( BOOL curVisibilityIn );
 
 	void			pushVisible(BOOL visible)	{ mLastVisible = mVisible; setVisible(visible); }
 	void			popVisible()				{ setVisible(mLastVisible); mLastVisible = TRUE; }
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index bfc046b7a..af37749c9 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -169,7 +169,7 @@ void LLFloaterChat::onClose(bool app_quitting)
 	setVisible(FALSE);
 }
 
-void LLFloaterChat::onVisibilityChange(BOOL new_visibility)
+void LLFloaterChat::handleVisibilityChange(BOOL new_visibility)
 {
 	// Hide the chat overlay when our history is visible.
 	updateConsoleVisibility();
@@ -180,7 +180,7 @@ void LLFloaterChat::onVisibilityChange(BOOL new_visibility)
 		LLFloaterChatterBox::getInstance()->setFloaterFlashing(this, FALSE);
 	}
 
-	LLFloater::onVisibilityChange(new_visibility);
+	LLFloater::handleVisibilityChange(new_visibility);
 }
 
 void LLFloaterChat::setMinimized(BOOL minimized)
diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h
index 775f21be6..4f9a03be5 100644
--- a/indra/newview/llfloaterchat.h
+++ b/indra/newview/llfloaterchat.h
@@ -62,7 +62,7 @@ public:
 	virtual void draw();
 	virtual BOOL postBuild();
 	virtual void onClose(bool app_quitting);
-	virtual void onVisibilityChange(BOOL cur_visibility);
+	virtual void handleVisibilityChange(BOOL cur_visibility);
 	virtual void setMinimized(BOOL);
 	void updateConsoleVisibility();
 	void updateSettings();
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index ff574bea8..1278de487 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -2050,7 +2050,7 @@ void LLFloaterIMPanel::onClose(bool app_quitting)
 	destroy();
 }
 
-void LLFloaterIMPanel::onVisibilityChange(BOOL new_visibility)
+void LLFloaterIMPanel::handleVisibilityChange(BOOL new_visibility)
 {
 	if (new_visibility)
 	{
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h
index 5787fc603..6f4e7d43a 100644
--- a/indra/newview/llimpanel.h
+++ b/indra/newview/llimpanel.h
@@ -204,7 +204,7 @@ public:
 	// Check typing timeout timer.
 	/*virtual*/ void draw();
 	/*virtual*/ void onClose(bool app_quitting = FALSE);
-	/*virtual*/ void onVisibilityChange(BOOL new_visibility);
+	/*virtual*/ void handleVisibilityChange(BOOL new_visibility);
 
 	// add target ids to the session. 
 	// Return TRUE if successful, otherwise FALSE.
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 8124e841d..186dd2f27 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -407,7 +407,7 @@ BOOL LLMediaCtrl::handleUnicodeCharHere(llwchar uni_char)
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-void LLMediaCtrl::onVisibilityChange ( BOOL new_visibility )
+void LLMediaCtrl::handleVisibilityChange ( BOOL new_visibility )
 {
 	// set state of frequent updates automatically if visibility changes
 	if ( new_visibility )
@@ -418,7 +418,7 @@ void LLMediaCtrl::onVisibilityChange ( BOOL new_visibility )
 	{
 		mFrequentUpdates = false;
 	}
-	LLUICtrl::onVisibilityChange(new_visibility);
+	LLUICtrl::handleVisibilityChange(new_visibility);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index bd5fa03ac..de0018988 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -133,7 +133,7 @@ class LLMediaCtrl :
 		virtual BOOL handleUnicodeCharHere(llwchar uni_char);
 		virtual void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE);
 		virtual void draw();
-		virtual void onVisibilityChange ( BOOL curVisibilityIn );
+		virtual void handleVisibilityChange ( BOOL curVisibilityIn );
 
 		// focus overrides
 		void onFocusLost();
diff --git a/indra/newview/llpaneldirbrowser.cpp b/indra/newview/llpaneldirbrowser.cpp
index 35f207ab2..a306d4730 100644
--- a/indra/newview/llpaneldirbrowser.cpp
+++ b/indra/newview/llpaneldirbrowser.cpp
@@ -1286,13 +1286,13 @@ void LLPanelDirBrowser::onKeystrokeName(LLLineEditor* line, void* data)
 }
 
 // setup results when shown
-void LLPanelDirBrowser::onVisibilityChange(BOOL new_visibility)
+void LLPanelDirBrowser::handleVisibilityChange(BOOL new_visibility)
 {
 	if (new_visibility)
 	{
 		onCommitList(NULL, this);
 	}
-	LLPanel::onVisibilityChange(new_visibility);
+	LLPanel::handleVisibilityChange(new_visibility);
 }
 
 S32 LLPanelDirBrowser::showNextButton(S32 rows)
diff --git a/indra/newview/llpaneldirbrowser.h b/indra/newview/llpaneldirbrowser.h
index e27b5524c..6fa6d7c47 100644
--- a/indra/newview/llpaneldirbrowser.h
+++ b/indra/newview/llpaneldirbrowser.h
@@ -57,7 +57,7 @@ public:
 	// Use to get periodic updates.
 	virtual void draw();
 
-	virtual void onVisibilityChange(BOOL curVisibilityIn);
+	virtual void handleVisibilityChange(BOOL curVisibilityIn);
 
 	// Redo your search for the prev/next page of results
 	virtual void prevPage();
diff --git a/indra/newview/llpaneldirfind.cpp b/indra/newview/llpaneldirfind.cpp
index f960fbb69..94edad4dd 100644
--- a/indra/newview/llpaneldirfind.cpp
+++ b/indra/newview/llpaneldirfind.cpp
@@ -194,13 +194,13 @@ void LLPanelDirFind::draw()
 // When we show any browser-based view, we want to hide all
 // the right-side XUI detail panels.
 // virtual
-void LLPanelDirFind::onVisibilityChange(BOOL new_visibility)
+void LLPanelDirFind::handleVisibilityChange(BOOL new_visibility)
 {
 	if (new_visibility)
 	{
 		mFloaterDirectory->hideAllDetailPanels();
 	}
-	LLPanel::onVisibilityChange(new_visibility);
+	LLPanel::handleVisibilityChange(new_visibility);
 }
 
 // virtual
diff --git a/indra/newview/llpaneldirfind.h b/indra/newview/llpaneldirfind.h
index 99c9daaf1..670f30c7e 100644
--- a/indra/newview/llpaneldirfind.h
+++ b/indra/newview/llpaneldirfind.h
@@ -53,7 +53,7 @@ public:
 
 	/*virtual*/ void draw();
 	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void onVisibilityChange(BOOL new_visibility);
+	/*virtual*/ void handleVisibilityChange(BOOL new_visibility);
 
 	// Pure virtual.  Must be implemented
 	virtual void search(const std::string& search_text) = 0;