diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-03-14 23:03:50 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-03-14 23:03:50 +0000 |
| commit | 00dbacb215da8d6b6739b4bcefebee552de89a9c (patch) | |
| tree | e1256e1fa3b195a1128bb152a876729c7f9a163d /indra/newview/llfloaterreporter.h | |
| parent | cf405184285c25723249d5a023b28d9498cf0c3f (diff) | |
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
Diffstat (limited to 'indra/newview/llfloaterreporter.h')
| -rw-r--r-- | indra/newview/llfloaterreporter.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llfloaterreporter.h b/indra/newview/llfloaterreporter.h index 795ef45e53..e8483b98ef 100644 --- a/indra/newview/llfloaterreporter.h +++ b/indra/newview/llfloaterreporter.h @@ -21,6 +21,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; @@ -51,7 +52,6 @@ enum EReportType CS_REQUEST_REPORT = 4 }; - class LLFloaterReporter : public LLFloater { @@ -87,11 +87,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); @@ -108,6 +113,7 @@ private: BOOL mCopyrightWarningSeen; std::list<LLMeanCollisionData*> mMCDList; LLString mDefaultSummary; + LLResourceData* mResourceDatap; }; #endif |