diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-04 21:17:04 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-04 21:17:04 -0800 |
| commit | 0dfc7f6145b0c179ee66dbc7539b7c3d9a68cc37 (patch) | |
| tree | 7cce8cf627609aec932923679fd811a671bd3b9c /indra/newview/llfloaterflickr.h | |
| parent | f5b356a7d4b51fbf509926295cb38d3a1e8442e3 (diff) | |
| parent | 5a23bf50bcee13a5841f680b13ca480753d367a1 (diff) | |
Pull merge from lindenlab/viewer-acme
Diffstat (limited to 'indra/newview/llfloaterflickr.h')
| -rw-r--r-- | indra/newview/llfloaterflickr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterflickr.h b/indra/newview/llfloaterflickr.h index e9005444d8..9a329d4451 100644 --- a/indra/newview/llfloaterflickr.h +++ b/indra/newview/llfloaterflickr.h @@ -117,7 +117,7 @@ public: static void postUpdate(); private: - LLFlickrPhotoPanel* mSocialPhotoPanel; + LLFlickrPhotoPanel* mFlickrPhotoPanel; LLTextBox* mStatusErrorText; LLTextBox* mStatusLoadingText; LLUICtrl* mStatusLoadingIndicator; |