diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloateroutfitsnapshot.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfloateroutfitsnapshot.h | 2 | ||||
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 16 | ||||
| -rw-r--r-- | indra/newview/llfloatersnapshot.h | 2 | 
4 files changed, 11 insertions, 11 deletions
| diff --git a/indra/newview/llfloateroutfitsnapshot.cpp b/indra/newview/llfloateroutfitsnapshot.cpp index c29c607449..d671c36a1c 100644 --- a/indra/newview/llfloateroutfitsnapshot.cpp +++ b/indra/newview/llfloateroutfitsnapshot.cpp @@ -256,8 +256,6 @@ BOOL LLFloaterOutfitSnapshot::postBuild()      }      childSetCommitCallback("filters_combobox", ImplBase::onClickFilter, this); -    LLWebProfile::setImageUploadResultCallback(boost::bind(&ImplBase::onSnapshotUploadFinished, this, _1)); -      sThumbnailPlaceholder = getChild<LLUICtrl>("thumbnail_placeholder");      // create preview window diff --git a/indra/newview/llfloateroutfitsnapshot.h b/indra/newview/llfloateroutfitsnapshot.h index c5c9ef09cb..c7b221937f 100644 --- a/indra/newview/llfloateroutfitsnapshot.h +++ b/indra/newview/llfloateroutfitsnapshot.h @@ -82,6 +82,8 @@ public:      {}      void updateResolution(void* data); +    static void onSnapshotUploadFinished(LLFloaterSnapshotBase* floater, bool status); +      /*virtual*/ LLPanelSnapshot* getActivePanel(LLFloaterSnapshotBase* floater, bool ok_if_not_found = true);      /*virtual*/ LLSnapshotModel::ESnapshotFormat getImageFormat(LLFloaterSnapshotBase* floater);      /*virtual*/ std::string getSnapshotPanelPrefix(); diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 2585c7c6a5..98d4034ccf 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -916,7 +916,7 @@ void LLFloaterSnapshot::Impl::applyCustomResolution(LLFloaterSnapshotBase* view,  }  // static -void LLFloaterSnapshotBase::ImplBase::onSnapshotUploadFinished(LLFloaterSnapshotBase* floater, bool status) +void LLFloaterSnapshot::Impl::onSnapshotUploadFinished(LLFloaterSnapshotBase* floater, bool status)  {  	floater->impl->setStatus(STATUS_FINISHED, status, "profile");  } @@ -1001,14 +1001,14 @@ BOOL LLFloaterSnapshot::postBuild()  	// Filters  	LLComboBox* filterbox = getChild<LLComboBox>("filters_combobox"); -    std::vector<std::string> filter_list = LLImageFiltersManager::getInstance()->getFiltersList(); -    for (U32 i = 0; i < filter_list.size(); i++) -    { -        filterbox->add(filter_list[i]); -    } -    childSetCommitCallback("filters_combobox", ImplBase::onClickFilter, this); +	std::vector<std::string> filter_list = LLImageFiltersManager::getInstance()->getFiltersList(); +	for (U32 i = 0; i < filter_list.size(); i++) +	{ +		filterbox->add(filter_list[i]); +	} +	childSetCommitCallback("filters_combobox", ImplBase::onClickFilter, this); -	LLWebProfile::setImageUploadResultCallback(boost::bind(&ImplBase::onSnapshotUploadFinished, this, _1)); +	LLWebProfile::setImageUploadResultCallback(boost::bind(&Impl::onSnapshotUploadFinished, this, _1));  	LLPostCard::setPostResultCallback(boost::bind(&Impl::onSendingPostcardFinished, this, _1));  	sThumbnailPlaceholder = getChild<LLUICtrl>("thumbnail_placeholder"); diff --git a/indra/newview/llfloatersnapshot.h b/indra/newview/llfloatersnapshot.h index 259d4f75a3..61639eebc5 100644 --- a/indra/newview/llfloatersnapshot.h +++ b/indra/newview/llfloatersnapshot.h @@ -101,7 +101,6 @@ public:  	static void onClickUICheck(LLUICtrl *ctrl, void* data);  	static void onClickHUDCheck(LLUICtrl *ctrl, void* data);  	static void onCommitFreezeFrame(LLUICtrl* ctrl, void* data); -	static void onSnapshotUploadFinished(LLFloaterSnapshotBase* floater, bool status);  	virtual LLPanelSnapshot* getActivePanel(LLFloaterSnapshotBase* floater, bool ok_if_not_found = true) = 0;  	virtual LLSnapshotModel::ESnapshotType getActiveSnapshotType(LLFloaterSnapshotBase* floater); @@ -179,6 +178,7 @@ public:  	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); | 
