Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 243 insertions, 243 deletions

diff --git a/indra/newview/llfloatersnapshot.h b/indra/newview/llfloatersnapshot.h
index 44064c73fd..adfec443d9 100644
--- a/indra/newview/llfloatersnapshot.h
+++ b/indra/newview/llfloatersnapshot.h
@@ -1,243 +1,243 @@
-/** 
- * @file llfloatersnapshot.h
- * @brief Snapshot preview window, allowing saving, e-mailing, etc.
- *
- * $LicenseInfo:firstyear=2004&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2016, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLFLOATERSNAPSHOT_H
-#define LL_LLFLOATERSNAPSHOT_H
-
-#include "llagent.h"
-#include "llfloater.h"
-#include "llpanelsnapshot.h"
-#include "llsnapshotmodel.h"
-
-class LLSpinCtrl;
-class LLSnapshotLivePreview;
-class LLToolset;
-
-class LLFloaterSnapshotBase : public LLFloater
-{
-    LOG_CLASS(LLFloaterSnapshotBase);
-
-public:
-
-    LLFloaterSnapshotBase(const LLSD& key);
-    virtual ~LLFloaterSnapshotBase();
-
-	/*virtual*/ void draw();
-	/*virtual*/ void onClose(bool app_quitting);
-	virtual S32 notify(const LLSD& info);
-
-	// TODO: create a snapshot model instead
-	virtual void saveTexture() = 0;
-	void postSave();
-	virtual void postPanelSwitch();
-	LLPointer<LLImageFormatted> getImageData();
-	LLSnapshotLivePreview* getPreviewView();
-	const LLVector3d& getPosTakenGlobal();
-
-	const LLRect& getThumbnailPlaceholderRect() { return mThumbnailPlaceholder->getRect(); }
-
-	void setRefreshLabelVisible(bool value) { if (mRefreshLabel) mRefreshLabel->setVisible(value); }
-	void setSuccessLabelPanelVisible(bool value) { if (mSucceessLblPanel) mSucceessLblPanel->setVisible(value); }
-	void setFailureLabelPanelVisible(bool value) { if (mFailureLblPanel) mFailureLblPanel->setVisible(value); }
-	void inventorySaveFailed();
-
-	class ImplBase;
-	friend class ImplBase;
-	ImplBase* impl;
-
-protected:
-	LLUICtrl* mThumbnailPlaceholder;
-	LLUICtrl *mRefreshBtn, *mRefreshLabel;
-	LLUICtrl *mSucceessLblPanel, *mFailureLblPanel;
-};
-
-class LLFloaterSnapshotBase::ImplBase
-{
-public:
-	typedef enum e_status
-	{
-		STATUS_READY,
-		STATUS_WORKING,
-		STATUS_FINISHED
-	} EStatus;
-
-	ImplBase(LLFloaterSnapshotBase* floater) : mAvatarPauseHandles(),
-		mLastToolset(NULL),
-		mAspectRatioCheckOff(false),
-		mNeedRefresh(false),
-        mSkipReshaping(false),
-		mStatus(STATUS_READY),
-		mFloater(floater)
-	{}
-	virtual ~ImplBase()
-	{
-		//unpause avatars
-		mAvatarPauseHandles.clear();
-	}
-
-	static void onClickNewSnapshot(void* data);
-	static void onClickAutoSnap(LLUICtrl *ctrl, void* data);
-	static void onClickNoPost(LLUICtrl *ctrl, void* data);
-	static void onClickFilter(LLUICtrl *ctrl, void* data);
-	static void onClickUICheck(LLUICtrl *ctrl, void* data);
-	static void onClickHUDCheck(LLUICtrl *ctrl, void* data);
-	static void onCommitFreezeFrame(LLUICtrl* ctrl, void* data);
-
-	virtual LLPanelSnapshot* getActivePanel(LLFloaterSnapshotBase* floater, bool ok_if_not_found = true) = 0;
-	virtual LLSnapshotModel::ESnapshotType getActiveSnapshotType(LLFloaterSnapshotBase* floater);
-	virtual LLSnapshotModel::ESnapshotFormat getImageFormat(LLFloaterSnapshotBase* floater) = 0;
-	virtual std::string getSnapshotPanelPrefix() = 0;
-
-	LLSnapshotLivePreview* getPreviewView();
-	virtual void updateControls(LLFloaterSnapshotBase* floater) = 0;
-	virtual void updateLayout(LLFloaterSnapshotBase* floater);
-	virtual void updateLivePreview();
-	virtual void setStatus(EStatus status, bool ok = true, const std::string& msg = LLStringUtil::null);
-	virtual EStatus getStatus() const { return mStatus; }
-	virtual void setNeedRefresh(bool need);
-
-	static bool updatePreviewList(bool initialized);
-
-	void setAdvanced(bool advanced) { mAdvanced = advanced; }
-    void setSkipReshaping(bool skip) { mSkipReshaping = skip; }
-
-	virtual LLSnapshotModel::ESnapshotLayerType getLayerType(LLFloaterSnapshotBase* floater) = 0;
-	virtual void checkAutoSnapshot(LLSnapshotLivePreview* floater, bool update_thumbnail = false);
-	void setWorking(bool working);
-	virtual void setFinished(bool finished, bool ok = true, const std::string& msg = LLStringUtil::null) = 0;
-
-public:
-	LLFloaterSnapshotBase* mFloater;
-	std::vector<LLAnimPauseRequest> mAvatarPauseHandles;
-
-	LLToolset*	mLastToolset;
-	LLHandle<LLView> mPreviewHandle;
-	bool mAspectRatioCheckOff;
-	bool mNeedRefresh;
-	bool mAdvanced;
-    bool mSkipReshaping;
-	EStatus mStatus;
-};
-
-class LLFloaterSnapshot : public LLFloaterSnapshotBase
-{
-	LOG_CLASS(LLFloaterSnapshot);
-
-public:
-	LLFloaterSnapshot(const LLSD& key);
-	/*virtual*/ ~LLFloaterSnapshot();
-    
-	/*virtual*/ bool postBuild();
-	/*virtual*/ void onOpen(const LLSD& key);
-	/*virtual*/ S32 notify(const LLSD& info);
-	
-	static void update();
-
-	void onExtendFloater();
-    void on360Snapshot();
-
-	static LLFloaterSnapshot* getInstance();
-	static LLFloaterSnapshot* findInstance();
-	/*virtual*/ void saveTexture();
-
-	typedef boost::signals2::signal<void(void)> snapshot_saved_signal_t;
-	void saveLocal(const snapshot_saved_signal_t::slot_type& success_cb, const snapshot_saved_signal_t::slot_type& failure_cb);
-	static void setAgentEmail(const std::string& email);
-
-	bool isWaitingState();
-
-	class Impl;
-	friend class Impl;
-};
-
-///----------------------------------------------------------------------------
-/// Class LLFloaterSnapshot::Impl
-///----------------------------------------------------------------------------
-
-class LLFloaterSnapshot::Impl : public LLFloaterSnapshotBase::ImplBase
-{
-	LOG_CLASS(LLFloaterSnapshot::Impl);
-public:
-	Impl(LLFloaterSnapshotBase* floater)
-		: LLFloaterSnapshotBase::ImplBase(floater)
-	{}
-	~Impl()
-	{}
-
-	void applyKeepAspectCheck(LLFloaterSnapshotBase* view, bool checked);
-	void updateResolution(LLUICtrl* ctrl, void* data, bool do_update = true);
-	static void onCommitLayerTypes(LLUICtrl* ctrl, void*data);
-	void onImageQualityChange(LLFloaterSnapshotBase* view, S32 quality_val);
-	void onImageFormatChange(LLFloaterSnapshotBase* view);
-	void applyCustomResolution(LLFloaterSnapshotBase* view, S32 w, S32 h);
-	static void onSendingPostcardFinished(LLFloaterSnapshotBase* floater, bool status);
-	bool checkImageSize(LLSnapshotLivePreview* previewp, S32& width, S32& height, bool isWidthChanged, S32 max_value);
-	void setImageSizeSpinnersValues(LLFloaterSnapshotBase *view, S32 width, S32 height);
-	void updateSpinners(LLFloaterSnapshotBase* view, LLSnapshotLivePreview* previewp, S32& width, S32& height, bool is_width_changed);
-	static void onSnapshotUploadFinished(LLFloaterSnapshotBase* floater, bool status);
-
-	/*virtual*/ LLPanelSnapshot* getActivePanel(LLFloaterSnapshotBase* floater, bool ok_if_not_found = true);
-	/*virtual*/ LLSnapshotModel::ESnapshotFormat getImageFormat(LLFloaterSnapshotBase* floater);
-	LLSpinCtrl* getWidthSpinner(LLFloaterSnapshotBase* floater);
-	LLSpinCtrl* getHeightSpinner(LLFloaterSnapshotBase* floater);
-	void enableAspectRatioCheckbox(LLFloaterSnapshotBase* floater, bool enable);
-	void setAspectRatioCheckboxValue(LLFloaterSnapshotBase* floater, bool checked);
-	/*virtual*/ std::string getSnapshotPanelPrefix();
-
-	void setResolution(LLFloaterSnapshotBase* floater, const std::string& comboname);
-	/*virtual*/ void updateControls(LLFloaterSnapshotBase* floater);
-
-private:
-	/*virtual*/ LLSnapshotModel::ESnapshotLayerType getLayerType(LLFloaterSnapshotBase* floater);
-	void comboSetCustom(LLFloaterSnapshotBase *floater, const std::string& comboname);
-	void checkAspectRatio(LLFloaterSnapshotBase *view, S32 index);
-	void setFinished(bool finished, bool ok = true, const std::string& msg = LLStringUtil::null);
-};
-
-class LLSnapshotFloaterView : public LLFloaterView
-{
-public:
-	struct Params 
-	:	public LLInitParam::Block<Params, LLFloaterView::Params>
-	{
-	};
-
-protected:
-	LLSnapshotFloaterView (const Params& p);
-	friend class LLUICtrlFactory;
-
-public:
-	virtual ~LLSnapshotFloaterView();
-
-	/*virtual*/	bool handleKey(KEY key, MASK mask, bool called_from_parent);
-	/*virtual*/	bool handleMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/	bool handleMouseUp(S32 x, S32 y, MASK mask);
-	/*virtual*/	bool handleHover(S32 x, S32 y, MASK mask);
-};
-
-extern LLSnapshotFloaterView* gSnapshotFloaterView;
-
-#endif // LL_LLFLOATERSNAPSHOT_H
+/**

+ * @file llfloatersnapshot.h

+ * @brief Snapshot preview window, allowing saving, e-mailing, etc.

+ *

+ * $LicenseInfo:firstyear=2004&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2016, Linden Research, Inc.

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation;

+ * version 2.1 of the License only.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ *

+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

+ * $/LicenseInfo$

+ */

+

+#ifndef LL_LLFLOATERSNAPSHOT_H

+#define LL_LLFLOATERSNAPSHOT_H

+

+#include "llagent.h"

+#include "llfloater.h"

+#include "llpanelsnapshot.h"

+#include "llsnapshotmodel.h"

+

+class LLSpinCtrl;

+class LLSnapshotLivePreview;

+class LLToolset;

+

+class LLFloaterSnapshotBase : public LLFloater

+{

+    LOG_CLASS(LLFloaterSnapshotBase);

+

+public:

+

+    LLFloaterSnapshotBase(const LLSD& key);

+    virtual ~LLFloaterSnapshotBase();

+

+    /*virtual*/ void draw();

+    /*virtual*/ void onClose(bool app_quitting);

+    virtual S32 notify(const LLSD& info);

+

+    // TODO: create a snapshot model instead

+    virtual void saveTexture() = 0;

+    void postSave();

+    virtual void postPanelSwitch();

+    LLPointer<LLImageFormatted> getImageData();

+    LLSnapshotLivePreview* getPreviewView();

+    const LLVector3d& getPosTakenGlobal();

+

+    const LLRect& getThumbnailPlaceholderRect() { return mThumbnailPlaceholder->getRect(); }

+

+    void setRefreshLabelVisible(bool value) { if (mRefreshLabel) mRefreshLabel->setVisible(value); }

+    void setSuccessLabelPanelVisible(bool value) { if (mSucceessLblPanel) mSucceessLblPanel->setVisible(value); }

+    void setFailureLabelPanelVisible(bool value) { if (mFailureLblPanel) mFailureLblPanel->setVisible(value); }

+    void inventorySaveFailed();

+

+    class ImplBase;

+    friend class ImplBase;

+    ImplBase* impl;

+

+protected:

+    LLUICtrl* mThumbnailPlaceholder;

+    LLUICtrl *mRefreshBtn, *mRefreshLabel;

+    LLUICtrl *mSucceessLblPanel, *mFailureLblPanel;

+};

+

+class LLFloaterSnapshotBase::ImplBase

+{

+public:

+    typedef enum e_status

+    {

+        STATUS_READY,

+        STATUS_WORKING,

+        STATUS_FINISHED

+    } EStatus;

+

+    ImplBase(LLFloaterSnapshotBase* floater) : mAvatarPauseHandles(),

+        mLastToolset(NULL),

+        mAspectRatioCheckOff(false),

+        mNeedRefresh(false),

+        mSkipReshaping(false),

+        mStatus(STATUS_READY),

+        mFloater(floater)

+    {}

+    virtual ~ImplBase()

+    {

+        //unpause avatars

+        mAvatarPauseHandles.clear();

+    }

+

+    static void onClickNewSnapshot(void* data);

+    static void onClickAutoSnap(LLUICtrl *ctrl, void* data);

+    static void onClickNoPost(LLUICtrl *ctrl, void* data);

+    static void onClickFilter(LLUICtrl *ctrl, void* data);

+    static void onClickUICheck(LLUICtrl *ctrl, void* data);

+    static void onClickHUDCheck(LLUICtrl *ctrl, void* data);

+    static void onCommitFreezeFrame(LLUICtrl* ctrl, void* data);

+

+    virtual LLPanelSnapshot* getActivePanel(LLFloaterSnapshotBase* floater, bool ok_if_not_found = true) = 0;

+    virtual LLSnapshotModel::ESnapshotType getActiveSnapshotType(LLFloaterSnapshotBase* floater);

+    virtual LLSnapshotModel::ESnapshotFormat getImageFormat(LLFloaterSnapshotBase* floater) = 0;

+    virtual std::string getSnapshotPanelPrefix() = 0;

+

+    LLSnapshotLivePreview* getPreviewView();

+    virtual void updateControls(LLFloaterSnapshotBase* floater) = 0;

+    virtual void updateLayout(LLFloaterSnapshotBase* floater);

+    virtual void updateLivePreview();

+    virtual void setStatus(EStatus status, bool ok = true, const std::string& msg = LLStringUtil::null);

+    virtual EStatus getStatus() const { return mStatus; }

+    virtual void setNeedRefresh(bool need);

+

+    static bool updatePreviewList(bool initialized);

+

+    void setAdvanced(bool advanced) { mAdvanced = advanced; }

+    void setSkipReshaping(bool skip) { mSkipReshaping = skip; }

+

+    virtual LLSnapshotModel::ESnapshotLayerType getLayerType(LLFloaterSnapshotBase* floater) = 0;

+    virtual void checkAutoSnapshot(LLSnapshotLivePreview* floater, bool update_thumbnail = false);

+    void setWorking(bool working);

+    virtual void setFinished(bool finished, bool ok = true, const std::string& msg = LLStringUtil::null) = 0;

+

+public:

+    LLFloaterSnapshotBase* mFloater;

+    std::vector<LLAnimPauseRequest> mAvatarPauseHandles;

+

+    LLToolset*  mLastToolset;

+    LLHandle<LLView> mPreviewHandle;

+    bool mAspectRatioCheckOff;

+    bool mNeedRefresh;

+    bool mAdvanced;

+    bool mSkipReshaping;

+    EStatus mStatus;

+};

+

+class LLFloaterSnapshot : public LLFloaterSnapshotBase

+{

+    LOG_CLASS(LLFloaterSnapshot);

+

+public:

+    LLFloaterSnapshot(const LLSD& key);

+    /*virtual*/ ~LLFloaterSnapshot();

+

+    /*virtual*/ bool postBuild();

+    /*virtual*/ void onOpen(const LLSD& key);

+    /*virtual*/ S32 notify(const LLSD& info);

+

+    static void update();

+

+    void onExtendFloater();

+    void on360Snapshot();

+

+    static LLFloaterSnapshot* getInstance();

+    static LLFloaterSnapshot* findInstance();

+    /*virtual*/ void saveTexture();

+

+    typedef boost::signals2::signal<void(void)> snapshot_saved_signal_t;

+    void saveLocal(const snapshot_saved_signal_t::slot_type& success_cb, const snapshot_saved_signal_t::slot_type& failure_cb);

+    static void setAgentEmail(const std::string& email);

+

+    bool isWaitingState();

+

+    class Impl;

+    friend class Impl;

+};

+

+///----------------------------------------------------------------------------

+/// Class LLFloaterSnapshot::Impl

+///----------------------------------------------------------------------------

+

+class LLFloaterSnapshot::Impl : public LLFloaterSnapshotBase::ImplBase

+{

+    LOG_CLASS(LLFloaterSnapshot::Impl);

+public:

+    Impl(LLFloaterSnapshotBase* floater)

+        : LLFloaterSnapshotBase::ImplBase(floater)

+    {}

+    ~Impl()

+    {}

+

+    void applyKeepAspectCheck(LLFloaterSnapshotBase* view, bool checked);

+    void updateResolution(LLUICtrl* ctrl, void* data, bool do_update = true);

+    static void onCommitLayerTypes(LLUICtrl* ctrl, void*data);

+    void onImageQualityChange(LLFloaterSnapshotBase* view, S32 quality_val);

+    void onImageFormatChange(LLFloaterSnapshotBase* view);

+    void applyCustomResolution(LLFloaterSnapshotBase* view, S32 w, S32 h);

+    static void onSendingPostcardFinished(LLFloaterSnapshotBase* floater, bool status);

+    bool checkImageSize(LLSnapshotLivePreview* previewp, S32& width, S32& height, bool isWidthChanged, S32 max_value);

+    void setImageSizeSpinnersValues(LLFloaterSnapshotBase *view, S32 width, S32 height);

+    void updateSpinners(LLFloaterSnapshotBase* view, LLSnapshotLivePreview* previewp, S32& width, S32& height, bool is_width_changed);

+    static void onSnapshotUploadFinished(LLFloaterSnapshotBase* floater, bool status);

+

+    /*virtual*/ LLPanelSnapshot* getActivePanel(LLFloaterSnapshotBase* floater, bool ok_if_not_found = true);

+    /*virtual*/ LLSnapshotModel::ESnapshotFormat getImageFormat(LLFloaterSnapshotBase* floater);

+    LLSpinCtrl* getWidthSpinner(LLFloaterSnapshotBase* floater);

+    LLSpinCtrl* getHeightSpinner(LLFloaterSnapshotBase* floater);

+    void enableAspectRatioCheckbox(LLFloaterSnapshotBase* floater, bool enable);

+    void setAspectRatioCheckboxValue(LLFloaterSnapshotBase* floater, bool checked);

+    /*virtual*/ std::string getSnapshotPanelPrefix();

+

+    void setResolution(LLFloaterSnapshotBase* floater, const std::string& comboname);

+    /*virtual*/ void updateControls(LLFloaterSnapshotBase* floater);

+

+private:

+    /*virtual*/ LLSnapshotModel::ESnapshotLayerType getLayerType(LLFloaterSnapshotBase* floater);

+    void comboSetCustom(LLFloaterSnapshotBase *floater, const std::string& comboname);

+    void checkAspectRatio(LLFloaterSnapshotBase *view, S32 index);

+    void setFinished(bool finished, bool ok = true, const std::string& msg = LLStringUtil::null);

+};

+

+class LLSnapshotFloaterView : public LLFloaterView

+{

+public:

+    struct Params

+    :   public LLInitParam::Block<Params, LLFloaterView::Params>

+    {

+    };

+

+protected:

+    LLSnapshotFloaterView (const Params& p);

+    friend class LLUICtrlFactory;

+

+public:

+    virtual ~LLSnapshotFloaterView();

+

+    /*virtual*/ bool handleKey(KEY key, MASK mask, bool called_from_parent);

+    /*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask);

+    /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask);

+    /*virtual*/ bool handleHover(S32 x, S32 y, MASK mask);

+};

+

+extern LLSnapshotFloaterView* gSnapshotFloaterView;

+

+#endif // LL_LLFLOATERSNAPSHOT_H