diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-07-22 18:49:39 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-07-22 18:49:39 -0700 |
| commit | fdb8c2fcdb956307328d6638ca7c81004498b116 (patch) | |
| tree | e8e23ff8ec4faae767ceeaee7fdcca6d4607fccd /indra/newview/llfloatersocial.cpp | |
| parent | 882b2508db4519b328016802ab72093df7911e68 (diff) | |
| parent | 9c97f4f5ef46369714b8e7beb2cb990f06b0f096 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloatersocial.cpp')
| -rw-r--r-- | indra/newview/llfloatersocial.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp index f0bd1bb71a..2eb112d328 100644 --- a/indra/newview/llfloatersocial.cpp +++ b/indra/newview/llfloatersocial.cpp @@ -650,8 +650,6 @@ void LLSocialAccountPanel::onVisibilityChange(const LLSD& new_visibility) LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLSocialAccountPanel"); LLEventPumps::instance().obtain("FacebookConnectState").listen("LLSocialAccountPanel", boost::bind(&LLSocialAccountPanel::onFacebookConnectStateChange, this, _1)); - LLFacebookConnect::instance().loadFacebookInfo(); - LLEventPumps::instance().obtain("FacebookConnectInfo").stopListening("LLSocialAccountPanel"); LLEventPumps::instance().obtain("FacebookConnectInfo").listen("LLSocialAccountPanel", boost::bind(&LLSocialAccountPanel::onFacebookConnectInfoChange, this)); |