6 files changed, 24 insertions, 22 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 65229c5654..a0771ff220 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -28,27 +28,23 @@
 
 #include "llfloatersnapshot.h"
 
-#include "llfloaterreg.h"
-
-// Viewer includes
 #include "llagent.h"
 #include "llfacebookconnect.h"
+#include "llfloaterreg.h"
 #include "llfloatersocial.h"
+#include "llcheckboxctrl.h"
 #include "llcombobox.h"
+#include "llpostcard.h"
+#include "llresmgr.h"		// LLLocale
+#include "llsdserialize.h"
 #include "llsidetraypanelcontainer.h"
+#include "llsnapshotlivepreview.h"
 #include "llspinctrl.h"
 #include "llviewercontrol.h"
-#include "llcheckboxctrl.h"
 #include "lltoolfocus.h"
 #include "lltoolmgr.h"
-#include "llwebsharing.h"
-//#include "llagentui.h"
-
-// Linden library includes
-#include "llsdserialize.h"
-#include "llpostcard.h"
-#include "llresmgr.h"		// LLLocale
 #include "llwebprofile.h"
+#include "llwebsharing.h"
 
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
diff --git a/indra/newview/llfloatersnapshot.h b/indra/newview/llfloatersnapshot.h
index afe135fa40..82af8c7a9d 100755
--- a/indra/newview/llfloatersnapshot.h
+++ b/indra/newview/llfloatersnapshot.h
@@ -27,7 +27,6 @@
 #ifndef LL_LLFLOATERSNAPSHOT_H
 #define LL_LLFLOATERSNAPSHOT_H
 
-#include "llimage.h"
 #include "llfloater.h"
 
 class LLSpinCtrl;
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp
index 80cdd3a0cb..ea69a60887 100644
--- a/indra/newview/llfloatersocial.cpp
+++ b/indra/newview/llfloatersocial.cpp
@@ -31,12 +31,16 @@
 
 #include "llagent.h"
 #include "llagentui.h"
+#include "llcheckboxctrl.h"
 #include "llcombobox.h"
 #include "llfacebookconnect.h"
 #include "llfloaterreg.h"
 #include "lliconctrl.h"
+#include "llresmgr.h"		// LLLocale
+#include "llsdserialize.h"
 #include "llloadingindicator.h"
 #include "llslurl.h"
+#include "llsnapshotlivepreview.h"
 #include "llviewerregion.h"
 #include "llviewercontrol.h"
 
@@ -201,7 +205,7 @@ void LLSocialPhotoPanel::updateResolution(LLUICtrl* ctrl, void* data, BOOL do_up
 			previewp->setSize(width, height);
 		}
 
-		checkAspectRatio(view, width) ;
+		checkAspectRatio(width);
 
 		previewp->getSize(width, height);
 		
@@ -230,7 +234,7 @@ void LLSocialPhotoPanel::setNeedRefresh(bool need)
 	mNeedRefresh = need;
 }
 
-void LLSocialPhotoPanel::checkAspectRatio(LLFloaterSnapshot *view, S32 index)
+void LLSocialPhotoPanel::checkAspectRatio(S32 index)
 {
 	LLSnapshotLivePreview *previewp = getPreviewView() ;
 
diff --git a/indra/newview/llfloatersocial.h b/indra/newview/llfloatersocial.h
index b7792e10c1..d4073212ff 100644
--- a/indra/newview/llfloatersocial.h
+++ b/indra/newview/llfloatersocial.h
@@ -30,7 +30,9 @@
 #include "llfloater.h"
 #include "llviewertexture.h"
 
-#include "llsnapshotlivepreview.h"
+class LLIconCtrl;
+class LLCheckBoxCtrl;
+class LLSnapshotLivePreview;
 
 class LLSocialStatusPanel : public LLPanel
 {
@@ -64,7 +66,7 @@ class LLSocialPhotoPanel : public LLPanel
 
 		void updateResolution(LLUICtrl* ctrl, void* data, BOOL do_update = TRUE);
 		void setNeedRefresh(bool need);
-		void checkAspectRatio(LLFloaterSnapshot *view, S32 index);
+		void checkAspectRatio(S32 index);
 		LLSnapshotLivePreview* getPreviewView();
 
 		void updateControls();
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index e8dc323ee6..7532ebfc57 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -35,6 +35,10 @@
 #include "llfloaterperms.h"
 #include "llfloaterreg.h"
 #include "llfloatersocial.h"
+#include "llimagebmp.h"
+#include "llimagej2c.h"
+#include "llimagejpeg.h"
+#include "llimagepng.h"
 #include "lllandmarkactions.h"
 #include "lllocalcliprect.h"
 #include "llnotificationsutil.h"
@@ -48,6 +52,7 @@
 #include "llvfs.h"
 #include "llwebsharing.h"
 #include "llwindow.h"
+#include "llworld.h"
 
 const F32 AUTO_SNAPSHOT_TIME_DELAY = 1.f;
 
@@ -57,7 +62,6 @@ F32 SHINE_OPACITY = 0.3f;
 F32 FALL_TIME = 0.6f;
 S32 BORDER_WIDTH = 6;
 
-const S32 MAX_POSTCARD_DATASIZE = 1024 * 1024; // one megabyte
 const S32 MAX_TEXTURE_SIZE = 512 ; //max upload texture size 512 * 512
 
 std::set<LLSnapshotLivePreview*> LLSnapshotLivePreview::sList;
diff --git a/indra/newview/llsnapshotlivepreview.h b/indra/newview/llsnapshotlivepreview.h
index b05032b858..fe3d257b02 100644
--- a/indra/newview/llsnapshotlivepreview.h
+++ b/indra/newview/llsnapshotlivepreview.h
@@ -27,13 +27,10 @@
 #ifndef LL_LLSNAPSHOTLIVEPREVIEW_H
 #define LL_LLSNAPSHOTLIVEPREVIEW_H
 
-#include "llimagebmp.h"
-#include "llimagej2c.h"
-#include "llimagejpeg.h"
-#include "llimagepng.h"
 #include "llpanelsnapshot.h"
 #include "llviewerwindow.h"
-#include "llworld.h"
+
+class LLImageJPEG;
 
 ///----------------------------------------------------------------------------
 /// Class LLSnapshotLivePreview