diff options
author | mberezhnoy <mberezhnoy@productengine.com> | 2013-01-30 21:30:20 +0200 |
---|---|---|
committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-01-30 21:30:20 +0200 |
commit | 84148762d974e728dbcb33f16aa641054ab0b641 (patch) | |
tree | d8a4477ea987de4eada4aca30a4ef4639e7ae077 /indra/newview/llviewermessage.cpp | |
parent | b96f04a1bb0577d42059246d15c244702ff02f88 (diff) | |
parent | 6af899f19e246c7fe4faa1edcdfbcfe9f01dbd25 (diff) |
merging
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); } |