Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added notification that chat report has been sent after the user logs in.

Browse Source 
This will also add a line in the chat log with the report id
This commit is contained in:
Latif Khalifa
2013-11-26 00:38:00 +01:00
parent 362415fe8a
commit 4e79bce3e2
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llappviewer.cpp
View File

@@ -4694,6 +4694,14 @@ void LLAppViewer::handleLoginComplete()
gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState(); gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();
} }
// After login is complete, check if the crash report has been sent in this session
// If it has, insert a notification
if (LLCrashLogger::sReportID)
{
LLNotificationsUtil::add("CrashReportSent", LLSD().with("REPORT_ID", llformat("%d", LLCrashLogger::sReportID)));
LLCrashLogger::sReportID = 0;
}
mOnLoginCompleted(); mOnLoginCompleted();
writeDebugInfo(); writeDebugInfo();

8
indra/newview/llcrashlogger.cpp
View File

@@ -63,11 +63,17 @@ public:
virtual void result(const LLSD& content) virtual void result(const LLSD& content)
{ {
std::string msg = "Crash report successfully sent"; std::string msg = "Crash report successfully sent";
if (content.has("message")) if (content.has("message"))
{ {
msg += ": " + content["message"].asString(); msg += ": " + content["message"].asString();
} }
llinfos << msg << llendl; llinfos << msg << llendl;
if (content.has("report_id"))
{
LLCrashLogger::sReportID = content["report_id"].asInteger();
}
} }
virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const
@@ -93,6 +99,8 @@ LLCrashLogger::~LLCrashLogger()
} }
/*static*/ S32 LLCrashLogger::sReportID = 0;
// TRIM_SIZE must remain larger than LINE_SEARCH_SIZE. // TRIM_SIZE must remain larger than LINE_SEARCH_SIZE.
const int TRIM_SIZE = 128000; const int TRIM_SIZE = 128000;
const int LINE_SEARCH_DIST = 500; const int LINE_SEARCH_DIST = 500;

7
indra/newview/llcrashlogger.h
View File

@@ -40,13 +40,14 @@ public:
LLCrashLogger(); LLCrashLogger();
virtual ~LLCrashLogger(); virtual ~LLCrashLogger();
S32 loadCrashBehaviorSetting(); S32 loadCrashBehaviorSetting();
bool readDebugFromXML(LLSD& dest, const std::string& filename ); static S32 sReportID;
bool readDebugFromXML(LLSD& dest, const std::string& filename );
void gatherFiles(); void gatherFiles();
void mergeLogs( LLSD src_sd ); void mergeLogs( LLSD src_sd );
virtual void gatherPlatformSpecificFiles() {} virtual void gatherPlatformSpecificFiles() {}
bool saveCrashBehaviorSetting(S32 crash_behavior); bool saveCrashBehaviorSetting(S32 crash_behavior);
bool sendCrashLog(std::string dump_dir); bool sendCrashLog(std::string dump_dir);
LLSD constructPostData(); LLSD constructPostData();
void setUserText(const std::string& text) { mCrashInfo["UserNotes"] = text; } void setUserText(const std::string& text) { mCrashInfo["UserNotes"] = text; }
S32 getCrashBehavior() { return mCrashBehavior; } S32 getCrashBehavior() { return mCrashBehavior; }

7
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -9742,4 +9742,11 @@ Do you wish to export anyway?
Object successfully exported to: [FILENAME] Object successfully exported to: [FILENAME]
</notification> </notification>
<notification
icon="notifytip.tga"
name="CrashReportSent"
type="notifytip">
Thank you for submitting the crash report! Report ID is [REPORT_ID]
</notification>
</notifications> </notifications>