Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs some post-merge cleanup.

1 files changed, 5 insertions, 6 deletions

diff --git a/indra/newview/llfloaterreporter.h b/indra/newview/llfloaterreporter.h
index 52bea736bf..f363b9531e 100644
--- a/indra/newview/llfloaterreporter.h
+++ b/indra/newview/llfloaterreporter.h
@@ -82,11 +82,13 @@ class LLFloaterReporter
 :	public LLFloater
 {
 public:
-	LLFloaterReporter(EReportType = UNKNOWN_REPORT);
+	LLFloaterReporter(const LLSD& key);
 	/*virtual*/ ~LLFloaterReporter();
 	/*virtual*/ BOOL postBuild();
 	virtual void draw();
-
+	
+	void setReportType(EReportType type) { mReportType = type; }
+	
 	// Enables all buttons
 	static void showFromMenu(EReportType report_type);
 
@@ -101,10 +103,6 @@ public:
 	static void addDescription(const std::string& description, LLMeanCollisionData *mcd = NULL);
 	static void setDescription(const std::string& description, LLMeanCollisionData *mcd = NULL);
 	
-	// returns a pointer to reporter of report_type
-	static LLFloaterReporter* getReporter(EReportType report_type);
-	static LLFloaterReporter* createNewAbuseReporter();
-
 	// static
 	static void processRegionInfo(LLMessageSystem* msg);
 	
@@ -126,6 +124,7 @@ private:
 
 private:
 	EReportType		mReportType;
+	BOOL			mEmailToEstateOwner;
 	LLUUID 			mObjectID;
 	LLUUID			mScreenID;
 	LLUUID			mAbuserID;