diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-10 16:01:50 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-10 16:01:50 -0700 |
| commit | e1337ce16e1575c544906dfb5c396fa7b517f112 (patch) | |
| tree | a83e750cb51d8981dc30797db4abb3a85bc3fd79 /indra/newview/llfloaterflickr.cpp | |
| parent | 8b5ce1e474ac621fc0d8da029e710734792e319d (diff) | |
MAINT-3555 : Consitency fix after merge of changeset f269634 in viewer-acme
Diffstat (limited to 'indra/newview/llfloaterflickr.cpp')
| -rw-r--r-- | indra/newview/llfloaterflickr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp index 8c4c36538b..2377cd7c92 100644 --- a/indra/newview/llfloaterflickr.cpp +++ b/indra/newview/llfloaterflickr.cpp @@ -52,8 +52,8 @@ #include "llviewerparcelmgr.h" #include "llviewerregion.h" -static LLRegisterPanelClassWrapper<LLFlickrPhotoPanel> t_panel_photo("llflickrphotopanel"); -static LLRegisterPanelClassWrapper<LLFlickrAccountPanel> t_panel_account("llflickraccountpanel"); +static LLPanelInjector<LLFlickrPhotoPanel> t_panel_photo("llflickrphotopanel"); +static LLPanelInjector<LLFlickrAccountPanel> t_panel_account("llflickraccountpanel"); const S32 MAX_POSTCARD_DATASIZE = 1024 * 1024; // one megabyte const std::string DEFAULT_PHOTO_QUERY_PARAMETERS = "?sourceid=slshare_photo&utm_source=flickr&utm_medium=photo&utm_campaign=slshare"; |