ACME-1293 : Use notification to signal from the snapshot panel to its container rather than grabbing global instances, use unique control_name for widgets, fix Post button visibility on Twitter

1 files changed, 2 insertions, 4 deletions

diff --git a/indra/newview/llfloaterflickr.h b/indra/newview/llfloaterflickr.h
index 1d9e649899..319ab1278f 100644
--- a/indra/newview/llfloaterflickr.h
+++ b/indra/newview/llfloaterflickr.h
@@ -42,6 +42,7 @@ public:
 	~LLFlickrPhotoPanel();
 
 	BOOL postBuild();
+	S32 notify(const LLSD& info);
 	void draw();
 
 	LLSnapshotLivePreview* getPreviewView();
@@ -73,7 +74,7 @@ private:
 	LLUICtrl * mTagsTextBox;
 	LLUICtrl * mRatingComboBox;
 	LLUICtrl * mPostButton;
-	LLUICtrl* mCancelButton;
+	LLUICtrl * mCancelButton;
 };
 
 class LLFlickrAccountPanel : public LLPanel
@@ -114,9 +115,6 @@ public:
 	
 	void showPhotoPanel();
 
-	static void preUpdate();
-	static void postUpdate();
-
 private:
 	LLFlickrPhotoPanel* mFlickrPhotoPanel;
     LLTextBox* mStatusErrorText;