Merge pull request #8 from secondlife/viewer-7.1.9

Update main to the version of BugSplat baked into viewer 7.1.9.
secondlife · Aug 26, 2024 · b1a383b · b1a383b
2 parents 32bf45b + 71fc41e
commit b1a383b
Show file tree

Hide file tree

Showing 230 changed files with 27,965 additions and 106,977 deletions.
diff --git a/BugSplat/BugSplat/Win32/Debug/BsSndRpt.exe b/BugSplat/BugSplat/Win32/Debug/BsSndRpt.exe
diff --git a/BugSplat/BugSplat/Win32/Debug/BugSplat.dll b/BugSplat/BugSplat/Win32/Debug/BugSplat.dll
diff --git a/BugSplat/BugSplat/Win32/Debug/BugSplat.lib b/BugSplat/BugSplat/Win32/Debug/BugSplat.lib
diff --git a/BugSplat/BugSplat/Win32/Debug/BugSplat.pdb b/BugSplat/BugSplat/Win32/Debug/BugSplat.pdb
diff --git a/BugSplat/BugSplat/Win32/Debug/BugSplatHD.exe b/BugSplat/BugSplat/Win32/Debug/BugSplatHD.exe
diff --git a/BugSplat/BugSplat/Win32/Debug/BugSplatHD.pdb b/BugSplat/BugSplat/Win32/Debug/BugSplatHD.pdb
diff --git a/BugSplat/bin64/BugSplatRc64.dll → BugSplat/BugSplat/Win32/Debug/BugSplatRc.dll b/BugSplat/bin64/BugSplatRc64.dll → BugSplat/BugSplat/Win32/Debug/BugSplatRc.dll
diff --git a/BugSplat/bin/BsSndRpt.exe → BugSplat/BugSplat/Win32/Release/BsSndRpt.exe b/BugSplat/bin/BsSndRpt.exe → BugSplat/BugSplat/Win32/Release/BsSndRpt.exe
diff --git a/BugSplat/BugSplat/Win32/Release/BugSplat.dll b/BugSplat/BugSplat/Win32/Release/BugSplat.dll
diff --git a/BugSplat/BugSplat/Win32/Release/BugSplat.lib b/BugSplat/BugSplat/Win32/Release/BugSplat.lib
diff --git a/BugSplat/BugSplat/Win32/Release/BugSplat.map b/BugSplat/BugSplat/Win32/Release/BugSplat.map
diff --git a/BugSplat/bin/BugSplat.pdb → BugSplat/BugSplat/Win32/Release/BugSplat.pdb b/BugSplat/bin/BugSplat.pdb → BugSplat/BugSplat/Win32/Release/BugSplat.pdb
diff --git a/BugSplat/bin/BugSplatHD.exe → ...lat/BugSplat/Win32/Release/BugSplatHD.exe b/BugSplat/bin/BugSplatHD.exe → ...lat/BugSplat/Win32/Release/BugSplatHD.exe
diff --git a/BugSplat/BugSplat/Win32/Release/BugSplatHD.pdb b/BugSplat/BugSplat/Win32/Release/BugSplatHD.pdb
diff --git a/BugSplat/bin/BugSplatRc.dll → ...lat/BugSplat/Win32/Release/BugSplatRc.dll b/BugSplat/bin/BugSplatRc.dll → ...lat/BugSplat/Win32/Release/BugSplatRc.dll
diff --git a/BugSplat/inc/BugSplat.h → BugSplat/BugSplat/inc/BugSplat.h b/BugSplat/inc/BugSplat.h → BugSplat/BugSplat/inc/BugSplat.h
diff --git a/BugSplat/inc/ReadMeOss.txt → BugSplat/BugSplat/inc/ReadMeOss.txt b/BugSplat/inc/ReadMeOss.txt → BugSplat/BugSplat/inc/ReadMeOss.txt
diff --git a/BugSplat/BugSplat/x64/Debug/BsSndRpt64.exe b/BugSplat/BugSplat/x64/Debug/BsSndRpt64.exe
diff --git a/BugSplat/BugSplat/x64/Debug/BugSplat64.dll b/BugSplat/BugSplat/x64/Debug/BugSplat64.dll
diff --git a/BugSplat/BugSplat/x64/Debug/BugSplat64.lib b/BugSplat/BugSplat/x64/Debug/BugSplat64.lib
diff --git a/BugSplat/BugSplat/x64/Debug/BugSplat64.pdb b/BugSplat/BugSplat/x64/Debug/BugSplat64.pdb
diff --git a/BugSplat/BugSplat/x64/Debug/BugSplatHD64.exe b/BugSplat/BugSplat/x64/Debug/BugSplatHD64.exe
diff --git a/BugSplat/BugSplat/x64/Debug/BugSplatHD64.pdb b/BugSplat/BugSplat/x64/Debug/BugSplatHD64.pdb
diff --git a/BugSplat/BugSplat/x64/Debug/BugSplatRc64.dll b/BugSplat/BugSplat/x64/Debug/BugSplatRc64.dll
diff --git a/BugSplat/BugSplat/x64/Release/BsSndRpt64.exe b/BugSplat/BugSplat/x64/Release/BsSndRpt64.exe
diff --git a/BugSplat/BugSplat/x64/Release/BugSplat64.dll b/BugSplat/BugSplat/x64/Release/BugSplat64.dll
diff --git a/BugSplat/BugSplat/x64/Release/BugSplat64.lib b/BugSplat/BugSplat/x64/Release/BugSplat64.lib
diff --git a/BugSplat/BugSplat/x64/Release/BugSplat64.map b/BugSplat/BugSplat/x64/Release/BugSplat64.map
diff --git a/BugSplat/bin64/BugSplat64.pdb → BugSplat/BugSplat/x64/Release/BugSplat64.pdb b/BugSplat/bin64/BugSplat64.pdb → BugSplat/BugSplat/x64/Release/BugSplat64.pdb
diff --git a/BugSplat/bin64/BugSplatHD64.exe → ...lat/BugSplat/x64/Release/BugSplatHD64.exe b/BugSplat/bin64/BugSplatHD64.exe → ...lat/BugSplat/x64/Release/BugSplatHD64.exe
diff --git a/BugSplat/BugSplat/x64/Release/BugSplatHD64.pdb b/BugSplat/BugSplat/x64/Release/BugSplatHD64.pdb
diff --git a/BugSplat/BugSplat/x64/Release/BugSplatRc64.dll b/BugSplat/BugSplat/x64/Release/BugSplatRc64.dll
diff --git a/BugSplat/BugSplatRc/BugSplatRc.rc b/BugSplat/BugSplatRc/BugSplatRc.rc
diff --git a/BugSplat/BugSplatRc/BugSplatRc.vcxproj b/BugSplat/BugSplatRc/BugSplatRc.vcxproj
diff --git a/BugSplat/BugSplatRc/res/EventLog.mc b/BugSplat/BugSplatRc/res/EventLog.mc
@@ -1,24 +1,24 @@
-;#ifndef __EVENTLOG_MC__
-;#define __EVENTLOG_MC__
-;
-
-
-LanguageNames =
-    (
-        English = 0x0409:Messages_ENU
-    )
-
-
-;////////////////////////////////////////
-;// Events
-;//
-
-MessageId       = +1
-SymbolicName    = EVENT_CRASH_LOGGED
-Language        = English   
-A crash report from application %2 has been successfully logged to www.BugSplat.com as %1-%3.
-.
-
-;
-;#endif  //__EVENTLOG_MC__
-;
+;#ifndef __EVENTLOG_MC__
+;#define __EVENTLOG_MC__
+;
+
+
+LanguageNames =
+    (
+        English = 0x0409:Messages_ENU
+    )
+
+
+;////////////////////////////////////////
+;// Events
+;//
+
+MessageId       = +1
+SymbolicName    = EVENT_CRASH_LOGGED
+Language        = English   
+A crash report from application %2 has been successfully logged to www.BugSplat.com as %1-%3.
+.
+
+;
+;#endif  //__EVENTLOG_MC__
+;
diff --git a/BugSplat/BugSplatRc/resBugSplatRc.h b/BugSplat/BugSplatRc/resBugSplatRc.h
@@ -1,59 +1,59 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by BugSplatRc.rc
-//
-#define IDDETAILS                       4
-#define IDDETAILS2                      5
-#define IDI_TICK                        101
-#define IDI_ERR                         102
-#define IDC_OPTIN                       999
-#define IDD_CRASHREPORT                 1000
-#define IDD_PROGRESS                    1001
-#define IDC_CRASHDLGHEADER              1001
-#define IDC_EDIT_DESCRIPTION            1001
-#define IDC_EDIT_NAME                   1002
-#define IDC_EDIT_POSTALADDRESS          1003
-#define IDD_REPORTDETAILS               1003
-#define IDC_EDIT_EMAILADDRESS           1004
-#define IDD_REPORTFILES                 1004
-#define IDS_PLEASETELL_VENDOR           1005
-#define IDC_SENDPROGRESS                1006
-#define IDC_TASK1                       1007
-#define IDC_STATIC_MSG1                 1007
-#define IDC_TASK2                       1008
-#define IDC_HYPERLINK                   1008
-#define IDC_TASK3                       1009
-#define IDC_EDIT1                       1009
-#define IDC_REPORTDETAILS               1010
-#define IDC_COMPLETE                    1010
-#define IDC_LISTFILES                   1011
-#define IDC_CHECK1                      1012
-#define IDC_SENDADDITIONALFILES         1012
-#define IDC_ADDITIONALFILEREQUEST       1013
-#define IDS_FAILED                      3000
-#define IDS_UNKNOWNERR                  3001
-#define IDS_CREATEREPORT_FAILED         3002
-#define IDS_FAILED_DMP_SAVE             3003
-#define IDS_FAILED_DMP_CREATE           3004
-#define IDS_OLD_DBGHELP                 3005
-#define IDS_NOEXIST_DBGHELP             3006
-#define IDS_UNABLETOVALIDATESERVER      3007
-#define IDS_UNABLETOCOLLECTDATA         3008
-#define IDS_UNABLETOREACHSERVER         3009
-#define IDS_INVALIDSERVERRESPONSE       3010
-#define IDS_LISTHEADER_FILE             3011
-#define IDS_LISTHEADER_FILEFOLDER       3012
-#define IDS_NEEDTODOWNLOADCOMPONENT     3013
-#define IDS_NEEDTODOWNLOADNEWERCOMPONENT 3014
-#define IDS_HUNG_SHUTDOWN               3015
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        1005
-#define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1015
-#define _APS_NEXT_SYMED_VALUE           1000
-#endif
-#endif
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by BugSplatRc.rc
+//
+#define IDDETAILS                       4
+#define IDDETAILS2                      5
+#define IDI_TICK                        101
+#define IDI_ERR                         102
+#define IDC_OPTIN                       999
+#define IDD_CRASHREPORT                 1000
+#define IDD_PROGRESS                    1001
+#define IDC_CRASHDLGHEADER              1001
+#define IDC_EDIT_DESCRIPTION            1001
+#define IDC_EDIT_NAME                   1002
+#define IDC_EDIT_POSTALADDRESS          1003
+#define IDD_REPORTDETAILS               1003
+#define IDC_EDIT_EMAILADDRESS           1004
+#define IDD_REPORTFILES                 1004
+#define IDS_PLEASETELL_VENDOR           1005
+#define IDC_SENDPROGRESS                1006
+#define IDC_TASK1                       1007
+#define IDC_STATIC_MSG1                 1007
+#define IDC_TASK2                       1008
+#define IDC_HYPERLINK                   1008
+#define IDC_TASK3                       1009
+#define IDC_EDIT1                       1009
+#define IDC_REPORTDETAILS               1010
+#define IDC_COMPLETE                    1010
+#define IDC_LISTFILES                   1011
+#define IDC_CHECK1                      1012
+#define IDC_SENDADDITIONALFILES         1012
+#define IDC_ADDITIONALFILEREQUEST       1013
+#define IDS_FAILED                      3000
+#define IDS_UNKNOWNERR                  3001
+#define IDS_CREATEREPORT_FAILED         3002
+#define IDS_FAILED_DMP_SAVE             3003
+#define IDS_FAILED_DMP_CREATE           3004
+#define IDS_OLD_DBGHELP                 3005
+#define IDS_NOEXIST_DBGHELP             3006
+#define IDS_UNABLETOVALIDATESERVER      3007
+#define IDS_UNABLETOCOLLECTDATA         3008
+#define IDS_UNABLETOREACHSERVER         3009
+#define IDS_INVALIDSERVERRESPONSE       3010
+#define IDS_LISTHEADER_FILE             3011
+#define IDS_LISTHEADER_FILEFOLDER       3012
+#define IDS_NEEDTODOWNLOADCOMPONENT     3013
+#define IDS_NEEDTODOWNLOADNEWERCOMPONENT 3014
+#define IDS_HUNG_SHUTDOWN               3015
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        1005
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1015
+#define _APS_NEXT_SYMED_VALUE           1000
+#endif
+#endif
diff --git a/BugSplat/Samples/myConsoleCrasher/Scripts/SendPdbs.ps1 b/BugSplat/Samples/myConsoleCrasher/Scripts/SendPdbs.ps1
@@ -0,0 +1,75 @@
+param(
+    [string] $projectDir,
+    [string] $outDir
+)
+
+if (!$projectDir)
+{
+    Write-Host "Please provide a value for command line argument -projectDir"
+    Exit 1
+}
+
+if (!$outDir)
+{
+    Write-Host "Please provide a value for command line argument -outDir"
+    Exit 1
+}
+
+try
+{
+    . $projectDir\Scripts\env.ps1
+}
+catch
+{
+    $BUGSPLAT_CLIENT_ID = $Env:BUGSPLAT_CLIENT_ID
+    $BUGSPLAT_CLIENT_SECRET = $Env:BUGSPLAT_CLIENT_SECRET
+}
+
+if (!$BUGSPLAT_CLIENT_ID)
+{
+    Write-Host 'Please add "$BUGSPLAT_CLIENT_ID={id}" to .\Scripts\env.ps1 or add BUGSPLAT_CLIENT_ID as an env variable'
+
+    Exit 1
+}
+
+if (!$BUGSPLAT_CLIENT_SECRET)
+{
+    Write-Host 'Please add "$BUGSPLAT_CLIENT_SECRET={secret}" to .\Scripts\env.ps1  or add BUGSPLAT_CLIENT_SECRET as an env variable'
+
+    Exit 1
+}
+
+$headerPath = $projectDir + "myConsoleCrasher.h"
+$nonCommentedDatabaseDefine = Select-String -Path $headerPath -Pattern "^#define BUGSPLAT_DATABASE"
+$nonCommentedDatabaseDefine -match 'BUGSPLAT_DATABASE L"(.*)"'
+$database = $matches[1]
+if (!$database)
+{
+    Write-Host "Please add '#define BUGSPLAT_DATABASE L`"{your BugSplat database}`"' to ..\Main.h"
+    Exit 1
+}
+Clear-Variable -Name "matches"
+
+$nonCommentedApplicationDefine = Select-String -Path $headerPath -Pattern "^#define APPLICATION_NAME"
+$nonCommentedApplicationDefine -match 'APPLICATION_NAME L"(.*)"'
+$appName = $matches[1]
+if (!$appName)
+{
+    Write-Host "Please add '#define APPLICATION_NAME L`"{your application name}`"' to ..\Main.h"
+    Exit 1
+}
+Clear-Variable -Name "matches"
+
+$nonCommentedVersionDefine = Select-String -Path $headerPath -Pattern "^#define APPLICATION_VERSION"
+$nonCommentedVersionDefine -match 'APPLICATION_VERSION L"(.*)"'
+$appVersion = $matches[1]
+if (!$appVersion)
+{
+    Write-Host "Please add '#define APPLICATION_VERSION L`"{your application name}`"' to ..\Main.h"
+    Exit 1
+}
+Clear-Variable -Name "matches"
+
+$sendPdbsPath = $projectDir + "..\..\Tools\SendPdbs.exe"
+Write-Host "Running SendPdbs.exe /b $database /a $appName /v $appVersion /u $BUGSPLAT_CLIENT_ID /p ****** /d $outDir"
+Start-Process -NoNewWindow -FilePath $sendPdbsPath -ArgumentList "/b $database /a $appName /v $appVersion /u $BUGSPLAT_CLIENT_ID /p $BUGSPLAT_CLIENT_SECRET /d $outDir"