diff options
| author | prep linden <prep@lindenlab.com> | 2010-11-18 16:22:25 -0500 | 
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2010-11-18 16:22:25 -0500 | 
| commit | 00700bd44d9f59c73d1b67a606bbbac4bc994f47 (patch) | |
| tree | e5bc4b4f9e7ad7d5b412d9a8712854423c8629cf | |
| parent | f8182738cc6f211fd028fef94f10e9e467d907d7 (diff) | |
misc cleanup
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 3 | 
2 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 541316efb3..6ee2e031fd 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -307,13 +307,13 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)  	mCommitCallbackRegistrar.add("Pref.BlockList",				boost::bind(&LLFloaterPreference::onClickBlockList, this));  	sSkin = gSavedSettings.getString("SkinCurrent"); -	//prep +	  	LLAvatarPropertiesProcessor::getInstance()->addObserver( gAgent.getID(), this );  	LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest( gAgent.getID() );  } -//prep +  void LLFloaterPreference::processProperties( void* pData, EAvatarProcessorType type )  {  	if ( APT_PROPERTIES == type ) @@ -493,7 +493,6 @@ void LLFloaterPreference::apply()  		}  	} -	//prep  	saveAvatarProperties();  } diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 9601ea1cd7..302d392ab3 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -78,7 +78,6 @@ public:  	// translate user's busy response message according to current locale if message is default, otherwise do nothing  	static void initBusyResponse(); -	//prep  	void processProperties( void* pData, EAvatarProcessorType type );  	void processProfileProperties(const LLAvatarData* pAvatarData );  	void storeAvatarProperties( const LLAvatarData* pAvatarData ); @@ -157,7 +156,7 @@ private:  	bool mOriginalHideOnlineStatus;  	std::string mDirectoryVisibility; -	//prep +	  	LLAvatarData mAvatarProperties;  };  | 
