1 files changed, 21 insertions, 2 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index c9cdc8f..bcac095 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1243,6 +1243,20 @@ bool idle_startup()
                 hashed_mac.finalize();
                 hashed_mac.hex_digest(hashed_mac_string);
 
+                // Don't report crashes if the grid we crashed in
+                // is different from the grid we log in
+                eLastExecEvent last_exec_event = LAST_EXEC_NORMAL;
+                {
+                        std::string current_grid = gHippoGridManager->getCurrentGrid()->getGridNick();
+                        std::string last_grid = gSavedSettings.getString("LastConnectedGrid");
+                        LL_DEBUGS("AppInit")    << "current grid: " << current_grid 
+                                                << " Last Connected Grid: " << last_grid << LL_ENDL;
+                        if( last_grid ==  current_grid )
+                        {
+                                last_exec_event = gLastExecEvent;
+                        }
+                }
+
                 // TODO if statement here to use web_login_key
                 if(web_login_key.isNull()){
                 sAuthUriNum = llclamp(sAuthUriNum, 0, (S32)sAuthUris.size()-1);
@@ -1257,7 +1271,7 @@ bool idle_startup()
                         gSkipOptionalUpdate,
                         gAcceptTOS,
                         gAcceptCriticalMessage,
-                        gLastExecEvent,
+                        last_exec_event,
                         requested_options,
                         hashed_mac_string,
                         LLAppViewer::instance()->getSerialNumber());
@@ -1272,7 +1286,7 @@ bool idle_startup()
                         gSkipOptionalUpdate,
                         gAcceptTOS,
                         gAcceptCriticalMessage,
-                        gLastExecEvent,
+                        last_exec_event,
                         requested_options,
                         hashed_mac_string,
                         LLAppViewer::instance()->getSerialNumber());
@@ -1510,6 +1524,11 @@ bool idle_startup()
 
                 if(successful_login)
                 {
+                        {
+                                std::string current_grid = gHippoGridManager->getConnectedGrid()->getGridNick();
+                                gSavedSettings.setString("LastConnectedGrid", current_grid);
+                        }
+
                         std::string text;
                         text = LLUserAuth::getInstance()->getResponse("udp_blacklist");
                         if(!text.empty())