diff options
| author | Cho <cho@lindenlab.com> | 2014-02-06 22:59:58 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-02-06 22:59:58 +0000 |
| commit | 968099312a70bf3c9a68254649a40eb4ec1ae928 (patch) | |
| tree | c8e7305878ad66fa3da45896beadcfb72251424a /indra | |
| parent | 10bfd9eadd76d0dff13be4a5c030b9cf68d26d7d (diff) | |
fixed SLShare connection state issues for ACME-1298
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfacebookconnect.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llflickrconnect.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/lltwitterconnect.cpp | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp index f9a3a21e94..e3ddb31935 100644 --- a/indra/newview/llfacebookconnect.cpp +++ b/indra/newview/llfacebookconnect.cpp @@ -610,12 +610,13 @@ void LLFacebookConnect::setConnectionState(LLFacebookConnect::EConnectionState c if (mConnectionState != connection_state) { + // set the connection state before notifying watchers + mConnectionState = connection_state; + LLSD state_info; state_info["enum"] = connection_state; sStateWatcher->post(state_info); } - - mConnectionState = connection_state; } void LLFacebookConnect::setConnected(bool connected) diff --git a/indra/newview/llflickrconnect.cpp b/indra/newview/llflickrconnect.cpp index 8f9f55c1ea..c09e738a26 100644 --- a/indra/newview/llflickrconnect.cpp +++ b/indra/newview/llflickrconnect.cpp @@ -465,12 +465,13 @@ void LLFlickrConnect::setConnectionState(LLFlickrConnect::EConnectionState conne if (mConnectionState != connection_state) { + // set the connection state before notifying watchers + mConnectionState = connection_state; + LLSD state_info; state_info["enum"] = connection_state; sStateWatcher->post(state_info); } - - mConnectionState = connection_state; } void LLFlickrConnect::setConnected(bool connected) diff --git a/indra/newview/lltwitterconnect.cpp b/indra/newview/lltwitterconnect.cpp index 7942b21319..350da84f69 100644 --- a/indra/newview/lltwitterconnect.cpp +++ b/indra/newview/lltwitterconnect.cpp @@ -459,12 +459,13 @@ void LLTwitterConnect::setConnectionState(LLTwitterConnect::EConnectionState con if (mConnectionState != connection_state) { + // set the connection state before notifying watchers + mConnectionState = connection_state; + LLSD state_info; state_info["enum"] = connection_state; sStateWatcher->post(state_info); } - - mConnectionState = connection_state; } void LLTwitterConnect::setConnected(bool connected) |