summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpeople.cpp
diff options
context:
space:
mode:
authordavep <none@none>2014-08-27 13:04:32 -0500
committerdavep <none@none>2014-08-27 13:04:32 -0500
commit749d1665643b33d6c5b7b97e43f4eae996fbf465 (patch)
treeeea7beb291f9fbffd5284da4f55701dcf5286720 /indra/newview/llpanelpeople.cpp
parentd0428575fb9c3d285dc32e61808a877cb24efa89 (diff)
parentb021c90e7bccdd0f9a916946e7716a00034254c2 (diff)
Automated merge with https://bitbucket.org/davep/viewer-release
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
-rwxr-xr-xindra/newview/llpanelpeople.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 9d9fb4040d..5977d558d3 100755
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -505,7 +505,7 @@ public:
LLPanelPeople::LLPanelPeople()
: LLPanel(),
- mTryToConnectToFbc(true),
+ mTryToConnectToFacebook(true),
mTabContainer(NULL),
mOnlineFriendList(NULL),
mAllFriendList(NULL),
@@ -865,10 +865,10 @@ void LLPanelPeople::updateFacebookList(bool visible)
{
LLFacebookConnect::instance().loadFacebookFriends();
}
- else if(mTryToConnectToFbc)
+ else if(mTryToConnectToFacebook)
{
LLFacebookConnect::instance().checkConnectionToFacebook();
- mTryToConnectToFbc = false;
+ mTryToConnectToFacebook = false;
}
updateSuggestedFriendList();