diff options
| author | prep <prep@lindenlab.com> | 2010-12-09 12:59:27 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2010-12-09 12:59:27 -0500 |
| commit | 064bdb00908f7b36e5ce65db28c7bd0ee9c9c0eb (patch) | |
| tree | b3e8d491260a016ab3dc8583ca4239e847e90921 /indra/newview | |
| parent | 1831c1a9508f858482fd728bb3edc274de401660 (diff) | |
Social-166
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 186ec96d9e..bcf5bf98e6 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -287,7 +287,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) mDoubleClickActionDirty(false) { - //Build Floater is now Called from LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>); static bool registered_dialog = false; @@ -358,17 +357,23 @@ void LLFloaterPreference::storeAvatarProperties( const LLAvatarData* pAvatarData mAvatarProperties.about_text = pAvatarData->about_text; mAvatarProperties.fl_about_text = pAvatarData->fl_about_text; mAvatarProperties.profile_url = pAvatarData->profile_url; - mAvatarProperties.allow_publish = pAvatarData->allow_publish; + mAvatarProperties.flags = pAvatarData->flags; + mAvatarProperties.allow_publish = pAvatarData->flags & AVATAR_ALLOW_PUBLISH; } void LLFloaterPreference::processProfileProperties(const LLAvatarData* pAvatarData ) { - getChild<LLUICtrl>("online_searchresults")->setValue( pAvatarData->allow_publish ); + getChild<LLUICtrl>("online_searchresults")->setValue( (bool)(pAvatarData->flags & AVATAR_ALLOW_PUBLISH) ); } void LLFloaterPreference::saveAvatarProperties( void ) { mAvatarProperties.allow_publish = getChild<LLUICtrl>("online_searchresults")->getValue(); + if ( mAvatarProperties.allow_publish ) + { + mAvatarProperties.flags |= AVATAR_ALLOW_PUBLISH; + } + LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesUpdate( &mAvatarProperties ); } @@ -571,7 +576,6 @@ void LLFloaterPreference::cancel() void LLFloaterPreference::onOpen(const LLSD& key) { - // this variable and if that follows it are used to properly handle busy mode response message static bool initialized = FALSE; // if user is logged in and we haven't initialized busy_response yet, do it |