diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-07 09:29:16 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-07 09:29:16 -0800 |
| commit | 36c1775828fb69fa5e5c3abb9c3eaeedbe15c847 (patch) | |
| tree | 35cf38b2babc8158d2bb170e2c109905e2ee9adf /indra/newview/llflickrconnect.cpp | |
| parent | 23727d02c8c941051a1aef8a51ecb493b65a2063 (diff) | |
| parent | 968099312a70bf3c9a68254649a40eb4ec1ae928 (diff) | |
Pull merge from lindenlab/viewer-acme
Diffstat (limited to 'indra/newview/llflickrconnect.cpp')
| -rw-r--r-- | indra/newview/llflickrconnect.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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) |