Second Life viewer sources 1.14.0.0

1 files changed, 9 insertions, 3 deletions

diff --git a/linden/indra/newview/llfloaterreporter.h b/linden/indra/newview/llfloaterreporter.h
index af01771..5e25d59 100644
--- a/linden/indra/newview/llfloaterreporter.h
+++ b/linden/indra/newview/llfloaterreporter.h
@@ -40,6 +40,7 @@ class LLViewerObject;
 class LLAgent;
 class LLToolObjPicker;
 class LLMeanCollisionData;
+struct LLResourceData;
 
 // these flags are used to label info requests to the server
 const U32 BUG_REPORT_REQUEST            = 0x01 << 0;
@@ -70,7 +71,6 @@ enum EReportType
         CS_REQUEST_REPORT = 4
 };
 
-
 class LLFloaterReporter
 :       public LLFloater
 {
@@ -106,11 +106,16 @@ public:
         static void processRegionInfo(LLMessageSystem* msg);
         
         void setPickedObjectProperties(const char *object_name, const char *owner_name);
-        void uploadScreenshot();
 
 private:
+        void takeScreenshot();
+        void sendReportViaCaps(std::string url);
+        void uploadImage();
+        bool validateReport();
         void setReporterID();
-        void sendReport();
+        LLSD gatherReport();
+        void sendReportViaLegacy(const LLSD & report);
+        void sendReportViaCaps(std::string url, std::string sshot_url, const LLSD & report);
         void setPosBox(const LLVector3d &pos);
         void enableControls(BOOL own_avatar);
         void getObjectInfo(const LLUUID& object_id);
@@ -127,6 +132,7 @@ private:
         BOOL                    mCopyrightWarningSeen;
         std::list<LLMeanCollisionData*> mMCDList;
         LLString                mDefaultSummary;
+        LLResourceData* mResourceDatap;
 };
 
 #endif