diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 948c28b3e6..084abb514a 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -76,7 +76,13 @@
 // Bugsplat (http://bugsplat.com) crash reporting tool
 #ifdef LL_BUGSPLAT
 #include "BugSplat.h"
-#include "reader.h"                 // JsonCpp
+
+#if LL_USESYSTEMLIBS
+#include "jsoncpp/reader.h" // JSON
+#else
+#include "json/reader.h" // JSON
+#endif
+
 #include "llagent.h"                // for agent location
 #include "llviewerregion.h"
 #include "llvoavatarself.h"         // for agent name
@@ -121,27 +127,49 @@ namespace
         {
             // send the main viewer log file
             // widen to wstring, convert to __wchar_t, then pass c_str()
-            sBugSplatSender->sendAdditionalFile(
-                WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "SecondLife.log")));
+            
+            // <FS:ND> We don't send log files
+            // sBugSplatSender->sendAdditionalFile(
+            //     WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "SecondLife.log")));
+            // </FS:ND>
+
+            // sBugSplatSender->sendAdditionalFile(
+            //   WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings.xml")));
+
+            if (gCrashSettings.getBOOL("CrashSubmitSettings"))
+                sBugSplatSender->sendAdditionalFile(  WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings.xml")));
 
-            sBugSplatSender->sendAdditionalFile(
-                WCSTR(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings.xml")));
 
             sBugSplatSender->sendAdditionalFile(
                 WCSTR(*LLAppViewer::instance()->getStaticDebugFile()));
 
             // We don't have an email address for any user. Hijack this
             // metadata field for the platform identifier.
-            sBugSplatSender->setDefaultUserEmail(
-                WCSTR(STRINGIZE(LLOSInfo::instance().getOSStringSimple() << " ("
-                                << ADDRESS_SIZE << "-bit)")));
+            // sBugSplatSender->setDefaultUserEmail(
+            //    WCSTR(STRINGIZE(LLOSInfo::instance().getOSStringSimple() << " ("
+            //                    << ADDRESS_SIZE << "-bit)")));
 
-            if (gAgentAvatarp)
+            // <FS:ND> Add which flavor of FS generated an error
+            std::string flavor = "hvk";
+#ifdef OPENSIM
+            flavor = "oss";
+#endif
+            sBugSplatSender->setDefaultUserEmail( WCSTR(STRINGIZE(LLOSInfo::instance().getOSStringSimple() << " ("  << ADDRESS_SIZE << "-bit, flavor " << flavor <<")")));
+            // </FS:ND>
+
+            // <FS:ND> Only send avatar name if enabled via prefs
+            if (gCrashSettings.getBOOL("CrashSubmitName"))
             {
-                // user name, when we have it
-                sBugSplatSender->setDefaultUserName(WCSTR(gAgentAvatarp->getFullname()));
+            // </FS:ND>
+                if (gAgentAvatarp)
+                {
+                    // user name, when we have it
+                    sBugSplatSender->setDefaultUserName(WCSTR(gAgentAvatarp->getFullname()));
+                }
+            // <FS:ND> Only send avatar name if enabled via prefs
             }
-
+            // </FS:ND>
+            
             // LL_ERRS message, when there is one
             sBugSplatSender->setDefaultUserDescription(WCSTR(LLError::getFatalMessage()));