diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 16:50:21 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 16:50:21 -0800 |
commit | 5ed6e0720af1b6cdf1a983e2c040eeb5d8ae33ba (patch) | |
tree | 5d0141f43cfaf59e5cb62eb2f4ca9541160e6173 /indra/newview/llpanelme.cpp | |
parent | 3ab4b0f58326a01a09aa99f262c03d2703215af2 (diff) | |
parent | 6e932911d5b0a02b44caf3bf81a9c00fd0e1dc89 (diff) |
warn-on-failure:unix-eol
automated merge from trunk
Diffstat (limited to 'indra/newview/llpanelme.cpp')
-rw-r--r-- | indra/newview/llpanelme.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp index ece93125b3..0f0fb4b94e 100644 --- a/indra/newview/llpanelme.cpp +++ b/indra/newview/llpanelme.cpp @@ -198,8 +198,6 @@ void LLPanelMyProfileEdit::processProfileProperties(const LLAvatarData* avatar_d { fillCommonData(avatar_data); - fillOnlineStatus(avatar_data); - fillPartnerData(avatar_data); fillAccountStatus(avatar_data); |