livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-apply FIRE-1071 and show email address used to forward IMs to in preferences again

Ansariel 2013-07-27 11:59:39 +02:00
parent 5d5aa94153
commit bf3152dc65
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
indra/newview/llfloaterpreference.cpp
View File

@ -1137,12 +1137,16 @@ void LLFloaterPreference::onBtnCancel()
}
// static
void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_via_email)
// <FS:Ansariel> Show email address in preferences (FIRE-1071)
//void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_via_email)
void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_via_email, const std::string& email)
{
LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
if (instance)
{
instance->setPersonalInfo(visibility, im_via_email);
// <FS:Ansariel> Show email address in preferences (FIRE-1071)
//instance->setPersonalInfo(visibility, im_via_email);
instance->setPersonalInfo(visibility, im_via_email, email);
}
}
@ -2056,7 +2060,10 @@ bool LLFloaterPreference::moveTranscriptsAndLog()
return true;
}
void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im_via_email)
// <FS:Ansariel> Show email address in preferences (FIRE-1071)
//void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im_via_email)
void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)
// </FS:Ansariel> Show email address in preferences (FIRE-1071)
{
mGotPersonalInfo = true;
mOriginalIMViaEmail = im_via_email;
@ -2100,13 +2107,13 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im
getChildView("reset_logpath")->setEnabled(TRUE);
}
// <FS:Ansariel> Show email address in preferences (FIRE-1071)
//getChild<LLUICtrl>("email_address")->setValue(display_email); <FS:TM> CHUI Merge LL removed this line, commenting out rest fror now
//if(display_email.size() > 30)
//{
// display_email.resize(30);
// display_email += "...";
//}
//getChild<LLCheckBoxCtrl>("send_im_to_email")->setLabelArg("[EMAIL]", display_email);
std::string display_email(email);
if(display_email.size() > 30)
{
display_email.resize(30);
display_email += "...";
}
getChild<LLCheckBoxCtrl>("send_im_to_email")->setLabelArg("[EMAIL]", display_email);
// </FS:Ansariel> Show email address in preferences (FIRE-1071)
}

9
indra/newview/llfloaterpreference.h
View File

@ -78,7 +78,9 @@ public:
/*virtual*/ void changed(const LLUUID& session_id, U32 mask) {};
// static data update, called from message handler
static void updateUserInfo(const std::string& visibility, bool im_via_email);
// <FS:Ansariel> Show email address in preferences (FIRE-1071)
//static void updateUserInfo(const std::string& visibility, bool im_via_email);
static void updateUserInfo(const std::string& visibility, bool im_via_email, const std::string& email);
// refresh all the graphics preferences menus
static void refreshEnabledGraphics();
@ -180,7 +182,10 @@ public:
//[FIX FIRE-2765 : SJ] Making sure Reset button resets works
void onClickResetLogPath();
void enableHistory();
void setPersonalInfo(const std::string& visibility, bool im_via_email);
// <FS:Ansariel> Show email address in preferences (FIRE-1071)
//void setPersonalInfo(const std::string& visibility, bool im_via_email);
void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email);
// </FS:Ansariel> Show email address in preferences (FIRE-1071)
void refreshEnabledState();
void disableUnavailableSettings();
void onCommitWindowedMode();

5
indra/newview/llviewermessage.cpp
View File

@ -8487,7 +8487,10 @@ void process_user_info_reply(LLMessageSystem* msg, void**)
std::string dir_visibility;
msg->getString( "UserData", "DirectoryVisibility", dir_visibility);
LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email);
// <FS:Ansariel> Show email address in preferences (FIRE-1071)
//LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email);
LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email, email);
// </FS:Ansariel> Show email address in preferences (FIRE-1071)
LLFloaterSnapshot::setAgentEmail(email);
}