diff options
author | Merov Linden <merov@lindenlab.com> | 2014-02-25 21:54:09 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-02-25 21:54:09 -0800 |
commit | d220657d8525ccfa246e0f49904e18cc36458b28 (patch) | |
tree | 2405915c3d04247d3a66f52d071d43684ad9d7e9 /indra/newview/llviewerfloaterreg.cpp | |
parent | 3fbaff17bf65a826dd8b9bd50dc460aacaa3cb00 (diff) |
ACME-1327 : WIP : Added big preview to the Flickr photo panel, uses the thumbnail for the moment
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
-rwxr-xr-x | indra/newview/llviewerfloaterreg.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 1f25110aa3..982522955c 100755 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -38,6 +38,7 @@ #include "llfloateravatar.h" #include "llfloateravatarpicker.h" #include "llfloateravatartextures.h" +#include "llfloaterbigpreview.h" #include "llfloaterbeacons.h" #include "llfloaterbuildoptions.h" #include "llfloaterbuy.h" @@ -324,6 +325,7 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("facebook", "floater_facebook.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFacebook>); LLFloaterReg::add("flickr", "floater_flickr.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFlickr>); LLFloaterReg::add("twitter", "floater_twitter.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTwitter>); + LLFloaterReg::add("big_preview", "floater_big_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBigPreview>); LLFloaterUIPreviewUtil::registerFloater(); LLFloaterReg::add("upload_anim_bvh", "floater_animation_bvh_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBvhPreview>, "upload"); |