diff options
| author | Richard Linden <none@none> | 2013-05-10 17:57:12 -0700 | 
|---|---|---|
| committer | Richard Linden <none@none> | 2013-05-10 17:57:12 -0700 | 
| commit | 41b4374760dd060a7f51a4a837851d5a03b7242a (patch) | |
| tree | d4d2c2c9051e3c11294bf66a5bd07ec44982d8e2 | |
| parent | 43f063fe2c814e28da69f2f5c373497a6d621460 (diff) | |
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect
standard naming conventions for handlers vs. reactors
30 files changed, 44 insertions, 44 deletions
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp index c025cd7939..0cd5fd938f 100644 --- a/indra/llui/llaccordionctrltab.cpp +++ b/indra/llui/llaccordionctrltab.cpp @@ -444,9 +444,9 @@ void LLAccordionCtrlTab::changeOpenClose(bool is_open)  	}  } -void LLAccordionCtrlTab::handleVisibilityChange(BOOL new_visibility) +void LLAccordionCtrlTab::onVisibilityChange(BOOL new_visibility)  { -	LLUICtrl::handleVisibilityChange(new_visibility); +	LLUICtrl::onVisibilityChange(new_visibility);  	notifyParent(LLSD().with("child_visibility_change", new_visibility));  } diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h index dddaa581e6..7a78700e0f 100644 --- a/indra/llui/llaccordionctrltab.h +++ b/indra/llui/llaccordionctrltab.h @@ -158,7 +158,7 @@ public:  	/**  	 * Raises notifyParent event with "child_visibility_change" = new_visibility  	 */ -	void handleVisibilityChange(BOOL new_visibility); +	void onVisibilityChange(BOOL new_visibility);  	// Changes expand/collapse state and triggers expand/collapse callbacks  	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index a29ad12d23..7d84b2a392 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -596,7 +596,7 @@ LLControlGroup*	LLFloater::getControlGroup()  void LLFloater::setVisible( BOOL visible )  { -	LLPanel::setVisible(visible); // calls handleVisibilityChange() +	LLPanel::setVisible(visible); // calls onVisibilityChange()  	if( visible && mFirstLook )  	{  		mFirstLook = FALSE; @@ -628,14 +628,14 @@ void LLFloater::setVisible( BOOL visible )  }  // virtual -void LLFloater::handleVisibilityChange ( BOOL new_visibility ) +void LLFloater::onVisibilityChange ( BOOL new_visibility )  {  	if (new_visibility)  	{  		if (getHost())  			getHost()->setFloaterFlashing(this, FALSE);  	} -	LLPanel::handleVisibilityChange ( new_visibility ); +	LLPanel::onVisibilityChange ( new_visibility );  }  void LLFloater::openFloater(const LLSD& key) @@ -779,7 +779,7 @@ void LLFloater::closeFloater(bool app_quitting)  		}  		else  		{ -			setVisible(FALSE); // hide before destroying (so handleVisibilityChange() gets called) +			setVisible(FALSE); // hide before destroying (so onVisibilityChange() gets called)  			if (!mReuseInstance)  			{  				destroy(); diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index aef63bcf93..939b2ddde3 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -298,7 +298,7 @@ public:  	virtual BOOL	canClose() { return TRUE; }  	/*virtual*/ void setVisible(BOOL visible); // do not override -	/*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); // do not override +	/*virtual*/ void onVisibilityChange ( BOOL new_visibility ); // do not override  	void			setFrontmost(BOOL take_focus = TRUE); diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 13888920f9..51cf352645 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -549,13 +549,13 @@ BOOL LLMenuItemGL::setLabelArg( const std::string& key, const LLStringExplicit&  	return TRUE;  } -void LLMenuItemGL::handleVisibilityChange(BOOL new_visibility) +void LLMenuItemGL::onVisibilityChange(BOOL new_visibility)  {  	if (getMenu())  	{  		getMenu()->needsArrange();  	} -	LLView::handleVisibilityChange(new_visibility); +	LLView::onVisibilityChange(new_visibility);  }  //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1146,13 +1146,13 @@ void LLMenuItemBranchGL::updateBranchParent(LLView* parentp)  	}  } -void LLMenuItemBranchGL::handleVisibilityChange( BOOL new_visibility ) +void LLMenuItemBranchGL::onVisibilityChange( BOOL new_visibility )  {  	if (new_visibility == FALSE && getBranch() && !getBranch()->getTornOff())  	{  		getBranch()->setVisible(FALSE);  	} -	LLMenuItemGL::handleVisibilityChange(new_visibility); +	LLMenuItemGL::onVisibilityChange(new_visibility);  }  BOOL LLMenuItemBranchGL::handleKeyHere( KEY key, MASK mask ) diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 00899020bc..b1d2223588 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -82,7 +82,7 @@ protected:  	friend class LLUICtrlFactory;  public:  	// LLView overrides -	/*virtual*/ void handleVisibilityChange(BOOL new_visibility); +	/*virtual*/ void onVisibilityChange(BOOL new_visibility);  	/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);  	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);  	/*virtual*/ BOOL handleRightMouseUp(S32 x, S32 y, MASK mask); @@ -631,7 +631,7 @@ public:  	virtual void updateBranchParent( LLView* parentp );  	// LLView Functionality -	virtual void handleVisibilityChange( BOOL curVisibilityIn ); +	virtual void onVisibilityChange( BOOL curVisibilityIn );  	virtual void draw(); diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index 188a0fea74..f157d6a923 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -342,9 +342,9 @@ BOOL LLPanel::handleKeyHere( KEY key, MASK mask )  	return handled;  } -void LLPanel::handleVisibilityChange ( BOOL new_visibility ) +void LLPanel::onVisibilityChange ( BOOL new_visibility )  { -	LLUICtrl::handleVisibilityChange ( new_visibility ); +	LLUICtrl::onVisibilityChange ( new_visibility );  	if (mVisibleSignal)  		(*mVisibleSignal)(this, LLSD(new_visibility) ); // Pass BOOL as LLSD  } diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index e63b41f97c..ac8583ece9 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -115,7 +115,7 @@ public:  	/*virtual*/ BOOL 	isPanel() const;  	/*virtual*/ void	draw();	  	/*virtual*/ BOOL	handleKeyHere( KEY key, MASK mask ); -	/*virtual*/ void 	handleVisibilityChange ( BOOL new_visibility ); +	/*virtual*/ void 	onVisibilityChange ( BOOL new_visibility );  	// From LLFocusableElement  	/*virtual*/ void	setFocus( BOOL b ); diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 680b6ed16d..025b3c4165 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1222,13 +1222,13 @@ void LLTextBase::setReadOnlyColor(const LLColor4 &c)  }  //virtual -void LLTextBase::handleVisibilityChange( BOOL new_visibility ) +void LLTextBase::onVisibilityChange( BOOL new_visibility )  {  	if(!new_visibility && mPopupMenu)  	{  		mPopupMenu->hide();  	} -	LLUICtrl::handleVisibilityChange(new_visibility); +	LLUICtrl::onVisibilityChange(new_visibility);  }  //virtual diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 2ce15d891a..bd0c8949dc 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -310,7 +310,7 @@ public:  	/*virtual*/ BOOL		acceptsTextInput() const { return !mReadOnly; }  	/*virtual*/ void		setColor( const LLColor4& c );  	virtual     void 		setReadOnlyColor(const LLColor4 &c); -	virtual	    void		handleVisibilityChange( BOOL new_visibility ); +	virtual	    void		onVisibilityChange( BOOL new_visibility );  	/*virtual*/ void		setValue(const LLSD& value );  	/*virtual*/ LLTextViewModel* getViewModel() const; diff --git a/indra/llui/lltoggleablemenu.cpp b/indra/llui/lltoggleablemenu.cpp index 00d52fe10d..ccb92ffbb2 100644 --- a/indra/llui/lltoggleablemenu.cpp +++ b/indra/llui/lltoggleablemenu.cpp @@ -52,7 +52,7 @@ boost::signals2::connection LLToggleableMenu::setVisibilityChangeCallback(const  }  // virtual -void LLToggleableMenu::handleVisibilityChange (BOOL curVisibilityIn) +void LLToggleableMenu::onVisibilityChange (BOOL curVisibilityIn)  {  	S32 x,y;  	LLUI::getMousePositionLocal(LLUI::getRootView(), &x, &y); diff --git a/indra/llui/lltoggleablemenu.h b/indra/llui/lltoggleablemenu.h index 4717b0d0ba..47e3b9f824 100644 --- a/indra/llui/lltoggleablemenu.h +++ b/indra/llui/lltoggleablemenu.h @@ -45,7 +45,7 @@ public:  	boost::signals2::connection setVisibilityChangeCallback( const commit_signal_t::slot_type& cb ); -	virtual void handleVisibilityChange (BOOL curVisibilityIn); +	virtual void onVisibilityChange (BOOL curVisibilityIn);  	virtual bool addChild (LLView* view, S32 tab_group = 0); diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index ba88396294..23bb3a1f27 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -641,21 +641,21 @@ void LLView::setVisible(BOOL visible)  		{  			// tell all children of this view that the visibility may have changed  			dirtyRect(); -			handleVisibilityChange( visible ); +			onVisibilityChange( visible );  		}  		updateBoundingRect();  	}  }  // virtual -void LLView::handleVisibilityChange ( BOOL new_visibility ) +void LLView::onVisibilityChange ( BOOL new_visibility )  {  	BOOST_FOREACH(LLView* viewp, mChildList)  	{  		// only views that are themselves visible will have their overall visibility affected by their ancestors  		if (viewp->getVisible())  		{ -			viewp->handleVisibilityChange ( new_visibility ); +			viewp->onVisibilityChange ( new_visibility );  		}  	}  } diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 88813da3c6..224d75bb85 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -308,7 +308,7 @@ public:  	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text ); -	virtual void	handleVisibilityChange ( BOOL new_visibility ); +	virtual void	onVisibilityChange ( BOOL new_visibility );  	void			pushVisible(BOOL visible)	{ mLastVisible = mVisible; setVisible(visible); }  	void			popVisible()				{ setVisible(mLastVisible); } diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 6cce013105..34c1127826 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -2865,7 +2865,7 @@ void LLPanelEnvironmentInfo::onOpen(const LLSD& key)  }  // virtual -void LLPanelEnvironmentInfo::handleVisibilityChange(BOOL new_visibility) +void LLPanelEnvironmentInfo::onVisibilityChange(BOOL new_visibility)  {  	// If hiding (user switched to another tab or closed the floater),  	// display user's preferred environment. diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index f0499f1903..dd961e21b2 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -402,7 +402,7 @@ public:  	/*virtual*/ void onOpen(const LLSD& key);  	// LLView -	/*virtual*/ void handleVisibilityChange(BOOL new_visibility); +	/*virtual*/ void onVisibilityChange(BOOL new_visibility);  	// LLPanelRegionInfo  	/*virtual*/ bool refreshFromRegion(LLViewerRegion* region); diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 99b4707158..b67ddf9b25 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -422,7 +422,7 @@ BOOL LLMediaCtrl::handleKeyHere( KEY key, MASK mask )  ////////////////////////////////////////////////////////////////////////////////  // -void LLMediaCtrl::handleVisibilityChange ( BOOL new_visibility ) +void LLMediaCtrl::onVisibilityChange ( BOOL new_visibility )  {  	llinfos << "visibility changed to " << (new_visibility?"true":"false") << llendl;  	if(mMediaSource) diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 7f2a5e1642..964ae08530 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -149,7 +149,7 @@ public:  		// over-rides  		virtual BOOL handleKeyHere( KEY key, MASK mask); -		virtual void handleVisibilityChange ( BOOL new_visibility ); +		virtual void onVisibilityChange ( BOOL new_visibility );  		virtual BOOL handleUnicodeCharHere(llwchar uni_char);  		virtual void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE);  		virtual void draw(); diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index a50d9074f7..74c810ea79 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -202,7 +202,7 @@ void LLPanelNearByMedia::onTopLost()  /*virtual*/  -void LLPanelNearByMedia::handleVisibilityChange ( BOOL new_visibility ) +void LLPanelNearByMedia::onVisibilityChange ( BOOL new_visibility )  {  	if (new_visibility)	  	{ diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h index c3634de9b4..a9c1b190cf 100644 --- a/indra/newview/llpanelnearbymedia.h +++ b/indra/newview/llpanelnearbymedia.h @@ -48,7 +48,7 @@ public:  	/*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask);  	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);  	/*virtual*/ void onTopLost(); -	/*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); +	/*virtual*/ void onVisibilityChange ( BOOL new_visibility );  	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);  	/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp index ce8057eead..b74547a9d7 100644 --- a/indra/newview/llpanelplaceprofile.cpp +++ b/indra/newview/llpanelplaceprofile.cpp @@ -302,9 +302,9 @@ void LLPanelPlaceProfile::processParcelInfo(const LLParcelData& parcel_data)  }  // virtual -void LLPanelPlaceProfile::handleVisibilityChange(BOOL new_visibility) +void LLPanelPlaceProfile::onVisibilityChange(BOOL new_visibility)  { -	LLPanel::handleVisibilityChange(new_visibility); +	LLPanel::onVisibilityChange(new_visibility);  	LLViewerParcelMgr* parcel_mgr = LLViewerParcelMgr::getInstance();  	if (!parcel_mgr) diff --git a/indra/newview/llpanelplaceprofile.h b/indra/newview/llpanelplaceprofile.h index a33fc12ce4..01adfd4940 100644 --- a/indra/newview/llpanelplaceprofile.h +++ b/indra/newview/llpanelplaceprofile.h @@ -47,7 +47,7 @@ public:  	/*virtual*/ void processParcelInfo(const LLParcelData& parcel_data); -	/*virtual*/ void handleVisibilityChange(BOOL new_visibility); +	/*virtual*/ void onVisibilityChange(BOOL new_visibility);  	// Displays information about the currently selected parcel  	// without sending a request to the server. diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index 6c2a01fc82..dc18cc6081 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -998,9 +998,9 @@ void LLPanelPlaces::togglePlaceInfoPanel(BOOL visible)  }  // virtual -void LLPanelPlaces::handleVisibilityChange(BOOL new_visibility) +void LLPanelPlaces::onVisibilityChange(BOOL new_visibility)  { -	LLPanel::handleVisibilityChange(new_visibility); +	LLPanel::onVisibilityChange(new_visibility);  	if (!new_visibility && mPlaceInfoType == AGENT_INFO_TYPE)  	{ diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h index 85bdc2c4e1..b6019ca32e 100644 --- a/indra/newview/llpanelplaces.h +++ b/indra/newview/llpanelplaces.h @@ -102,7 +102,7 @@ private:  	void togglePickPanel(BOOL visible);  	void togglePlaceInfoPanel(BOOL visible); -	/*virtual*/ void handleVisibilityChange(BOOL new_visibility); +	/*virtual*/ void onVisibilityChange(BOOL new_visibility);  	void updateVerbs(); diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp index 6be2ea6481..1782afddd9 100644 --- a/indra/newview/llpanelvoicedevicesettings.cpp +++ b/indra/newview/llpanelvoicedevicesettings.cpp @@ -85,7 +85,7 @@ BOOL LLPanelVoiceDeviceSettings::postBuild()  }  // virtual -void LLPanelVoiceDeviceSettings::handleVisibilityChange ( BOOL new_visibility ) +void LLPanelVoiceDeviceSettings::onVisibilityChange ( BOOL new_visibility )  {  	if (new_visibility)  	{ diff --git a/indra/newview/llpanelvoicedevicesettings.h b/indra/newview/llpanelvoicedevicesettings.h index ba3bcad0dc..83464f476a 100644 --- a/indra/newview/llpanelvoicedevicesettings.h +++ b/indra/newview/llpanelvoicedevicesettings.h @@ -44,7 +44,7 @@ public:  	void initialize();  	void cleanup(); -	/*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); +	/*virtual*/ void onVisibilityChange ( BOOL new_visibility );  	void setUseTuningMode(bool use) { mUseTuningMode = use; }; diff --git a/indra/newview/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp index aea7b33d7f..cb00f742cc 100644 --- a/indra/newview/llpanelvolumepulldown.cpp +++ b/indra/newview/llpanelvolumepulldown.cpp @@ -87,7 +87,7 @@ void LLPanelVolumePulldown::onMouseLeave(S32 x, S32 y, MASK mask)  }  /*virtual*/  -void LLPanelVolumePulldown::handleVisibilityChange ( BOOL new_visibility ) +void LLPanelVolumePulldown::onVisibilityChange ( BOOL new_visibility )  {  	if (new_visibility)	  	{ diff --git a/indra/newview/llpanelvolumepulldown.h b/indra/newview/llpanelvolumepulldown.h index 0d86e6bd28..b843fab756 100644 --- a/indra/newview/llpanelvolumepulldown.h +++ b/indra/newview/llpanelvolumepulldown.h @@ -42,7 +42,7 @@ class LLPanelVolumePulldown : public LLPanel  	/*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask);  	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);  	/*virtual*/ void onTopLost(); -	/*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); +	/*virtual*/ void onVisibilityChange ( BOOL new_visibility );  	/*virtual*/ BOOL postBuild();   private: diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp index 986ac14140..191e0abefd 100644 --- a/indra/newview/llsidepaneltaskinfo.cpp +++ b/indra/newview/llsidepaneltaskinfo.cpp @@ -162,7 +162,7 @@ BOOL LLSidepanelTaskInfo::postBuild()  	return TRUE;  } -/*virtual*/ void LLSidepanelTaskInfo::handleVisibilityChange ( BOOL visible ) +/*virtual*/ void LLSidepanelTaskInfo::onVisibilityChange ( BOOL visible )  {  	if (visible)  	{ diff --git a/indra/newview/llsidepaneltaskinfo.h b/indra/newview/llsidepaneltaskinfo.h index 05edcda5ed..a1479ef0e7 100644 --- a/indra/newview/llsidepaneltaskinfo.h +++ b/indra/newview/llsidepaneltaskinfo.h @@ -50,7 +50,7 @@ public:  	virtual ~LLSidepanelTaskInfo();  	/*virtual*/	BOOL postBuild(); -	/*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); +	/*virtual*/ void onVisibilityChange ( BOOL new_visibility );  	void setObjectSelection(LLObjectSelectionHandle selection);  | 
