MAINT-5194 Visual Outfit browser

Made refactoring of LLFloaterOutfitSnapshot and LLFloaterSnapshot

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/llpanelsnapshotlocal.cpp b/indra/newview/llpanelsnapshotlocal.cpp
index 954eb63a28..3652c10586 100644
--- a/indra/newview/llpanelsnapshotlocal.cpp
+++ b/indra/newview/llpanelsnapshotlocal.cpp
@@ -56,9 +56,9 @@ private:
 	/*virtual*/ std::string getAspectRatioCBName() const	{ return "local_keep_aspect_check"; }
 	/*virtual*/ std::string getImageSizeComboName() const	{ return "local_size_combo"; }
 	/*virtual*/ std::string getImageSizePanelName() const	{ return "local_image_size_lp"; }
-    /*virtual*/ LLFloaterSnapshotBase::ESnapshotFormat getImageFormat() const;
-    /*virtual*/ LLPanelSnapshot::ESnapshotType getSnapshotType();
-    /*virtual*/ void updateControls(const LLSD& info);
+	/*virtual*/ LLSnapshotModel::ESnapshotFormat getImageFormat() const;
+	/*virtual*/ LLSnapshotModel::ESnapshotType getSnapshotType();
+	/*virtual*/ void updateControls(const LLSD& info);
 
 	S32 mLocalFormat;
 
@@ -96,23 +96,23 @@ void LLPanelSnapshotLocal::onOpen(const LLSD& key)
 }
 
 // virtual
-LLFloaterSnapshotBase::ESnapshotFormat LLPanelSnapshotLocal::getImageFormat() const
+LLSnapshotModel::ESnapshotFormat LLPanelSnapshotLocal::getImageFormat() const
 {
-    LLFloaterSnapshotBase::ESnapshotFormat fmt = LLFloaterSnapshot::SNAPSHOT_FORMAT_PNG;
+	LLSnapshotModel::ESnapshotFormat fmt = LLSnapshotModel::SNAPSHOT_FORMAT_PNG;
 
 	LLComboBox* local_format_combo = getChild<LLComboBox>("local_format_combo");
 	const std::string id  = local_format_combo->getValue().asString();
 	if (id == "PNG")
 	{
-		fmt = LLFloaterSnapshot::SNAPSHOT_FORMAT_PNG;
+		fmt = LLSnapshotModel::SNAPSHOT_FORMAT_PNG;
 	}
 	else if (id == "JPEG")
 	{
-		fmt = LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG;
+		fmt = LLSnapshotModel::SNAPSHOT_FORMAT_JPEG;
 	}
 	else if (id == "BMP")
 	{
-		fmt = LLFloaterSnapshot::SNAPSHOT_FORMAT_BMP;
+		fmt = LLSnapshotModel::SNAPSHOT_FORMAT_BMP;
 	}
 
 	return fmt;
@@ -121,11 +121,11 @@ LLFloaterSnapshotBase::ESnapshotFormat LLPanelSnapshotLocal::getImageFormat() co
 // virtual
 void LLPanelSnapshotLocal::updateControls(const LLSD& info)
 {
-    LLFloaterSnapshotBase::ESnapshotFormat fmt =
-        (LLFloaterSnapshotBase::ESnapshotFormat) gSavedSettings.getS32("SnapshotFormat");
+	LLSnapshotModel::ESnapshotFormat fmt =
+		(LLSnapshotModel::ESnapshotFormat) gSavedSettings.getS32("SnapshotFormat");
 	getChild<LLComboBox>("local_format_combo")->selectNthItem((S32) fmt);
 
-	const bool show_quality_ctrls = (fmt == LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG);
+	const bool show_quality_ctrls = (fmt == LLSnapshotModel::SNAPSHOT_FORMAT_JPEG);
 	getChild<LLUICtrl>("image_quality_slider")->setVisible(show_quality_ctrls);
 	getChild<LLUICtrl>("image_quality_level")->setVisible(show_quality_ctrls);
 
@@ -164,10 +164,10 @@ void LLPanelSnapshotLocal::onSaveFlyoutCommit(LLUICtrl* ctrl)
 	LLFloaterSnapshot* floater = LLFloaterSnapshot::getInstance();
 
 	floater->notify(LLSD().with("set-working", true));
-	BOOL saved = LLFloaterSnapshot::saveLocal();
+	BOOL saved = floater->saveLocal();
 	if (saved)
 	{
-		LLFloaterSnapshot::postSave();
+		mSnapshotFloater->postSave();
 		goBack();
 		floater->notify(LLSD().with("set-finished", LLSD().with("ok", true).with("msg", "local")));
 	}
@@ -177,7 +177,7 @@ void LLPanelSnapshotLocal::onSaveFlyoutCommit(LLUICtrl* ctrl)
 	}
 }
 
-LLPanelSnapshot::ESnapshotType LLPanelSnapshotLocal::getSnapshotType()
+LLSnapshotModel::ESnapshotType LLPanelSnapshotLocal::getSnapshotType()
 {
-    return LLPanelSnapshot::SNAPSHOT_LOCAL;
+	return LLSnapshotModel::SNAPSHOT_LOCAL;
 }