Merge

.hgtags

BuildParams

indra/llimage/llimage.cpp

indra/llimage/llimage.h

indra/llimage/llimagedimensionsinfo.cpp

indra/llkdu/llimagej2ckdu.cpp

indra/llui/llfloater.cpp

indra/llui/llfocusmgr.cpp

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llappviewer.cpp

indra/newview/llfloaterfacebook.cpp

indra/newview/llfloaterflickr.cpp

indra/newview/llfloateroutfitsnapshot.cpp

indra/newview/llfloateroutfitsnapshot.h

indra/newview/llfloatersnapshot.cpp

indra/newview/llfloatersnapshot.h