diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 541316efb35fa1205e96476dcec388e74edc108a..6ee2e031fd30206f3d3c9b44c8e7e697c2f37b03 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 9601ea1cd7014ae8e1ca09880768ec80a20101ec..302d392ab361bfbdf5d5cf91bc6cbd8d0a039cb3 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -78,7 +78,6 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver // 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 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver bool mOriginalHideOnlineStatus; std::string mDirectoryVisibility; - //prep + LLAvatarData mAvatarProperties; };