diff options
| author | Cho <cho@lindenlab.com> | 2013-01-29 00:19:05 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-01-29 00:19:05 +0000 |
| commit | f9d44737b780542c4f4e3f02122b0cf9fb0fd8c6 (patch) | |
| tree | 288ba6cb91c0f3e617b0327146bc73773912a58f /indra/newview/llviewermessage.cpp | |
| parent | 427725c2a6d5c50468e7579a4d3b92795425723f (diff) | |
| parent | af969270990ca719277def274b8ebf20539cc435 (diff) | |
merging latest changes
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 8489e92d15..f141419c43 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -6943,7 +6943,7 @@ 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, email); + LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email); LLFloaterSnapshot::setAgentEmail(email); } |