Integrating github/staging through commit 5f214be

Code/Tools/CrashHandler/Shared/CrashHandler.h

@@ -21,7 +21,7 @@
 namespace CrashHandler
 {
     static const char* defaultCrashFolder = "CrashDB/";
-    static const char* lumberyardProductName = "lumberyard";
+    static const char* O3DEProductName = "Open 3D Engine";
 
     using CrashHandlerAnnotations = std::map<std::string, std::string>;
     using CrashHandlerArguments = std::vector<std::string>;
@@ -48,7 +48,7 @@ namespace CrashHandler
 
         virtual std::string DetermineAppPath() const;
 
-        virtual const char* GetProductName() const { return lumberyardProductName; }
+        virtual const char* GetProductName() const { return O3DEProductName; }
 
         virtual bool CreateCrashHandlerDB(const std::string& reportPath) const;
 

Code/Tools/CrashHandler/Tools/UI/submit_report.ui

@@ -80,7 +80,7 @@
     </rect>
    </property>
    <property name="text">
-    <string>Lumberyard has encountered a fatal error.  We're sorry for the inconvenience.</string>
+    <string>Open 3D Engine has encountered a fatal error.  We're sorry for the inconvenience.</string>
    </property>
    <property name="wordWrap">
     <bool>true</bool>
@@ -96,7 +96,7 @@
     </rect>
    </property>
    <property name="text">
-    <string>A Lumberyard Editor crash debugging file has been created at:</string>
+    <string>An Open 3D Engine Editor crash debugging file has been created at:</string>
    </property>
    <property name="wordWrap">
     <bool>true</bool>
@@ -134,7 +134,7 @@
     </rect>
    </property>
    <property name="text">
-    <string>If you are willing to submit this file to Amazon it will help us improve the Lumberyard experience.  We will treat this report as confidential.</string>
+    <string>If you are willing to submit this file to Amazon it will help us improve the Open 3D Engine experience.  We will treat this report as confidential.</string>
    </property>
    <property name="wordWrap">
     <bool>true</bool>

Code/Tools/CrashHandler/Tools/Uploader/ToolsCrashUploader.cpp

@@ -32,11 +32,11 @@
 
 #include "UI/ui_submit_report.h"
 
-namespace Lumberyard
+namespace O3de
 {
     void InstallCrashUploader(int& argc, char* argv[])
     {
-        Lumberyard::CrashUploader::SetCrashUploader(std::make_shared<Lumberyard::ToolsCrashUploader>(argc, argv));
+        O3de::CrashUploader::SetCrashUploader(std::make_shared<O3de::ToolsCrashUploader>(argc, argv));
     }
     QString GetReportString(const std::wstring& reportPath)
     {

Code/Tools/CrashHandler/Tools/Uploader/ToolsCrashUploader.h

@@ -16,7 +16,7 @@
 
 #include <Uploader/CrashUploader.h>
 
-namespace Lumberyard
+namespace O3de
 {
     class ToolsCrashUploader : public CrashUploader
     {

Code/Tools/CrashHandler/Tools/Uploader/platforms/win/main.cpp

@@ -22,10 +22,10 @@ namespace
 {
     int HandlerMain(int argc, char* argv[])
     {
-        Lumberyard::InstallCrashUploader(argc, argv);
+        O3de::InstallCrashUploader(argc, argv);
 
         LOG(ERROR) << "Initializing windows crash uploader";
-        int resultCode = crashpad::HandlerMain(argc, argv, Lumberyard::CrashUploader::GetCrashUploader()->GetUserStreamSources());
+        int resultCode = crashpad::HandlerMain(argc, argv, O3de::CrashUploader::GetCrashUploader()->GetUserStreamSources());
         
         return resultCode;
     }

Code/Tools/CrashHandler/Uploader/include/Uploader/BufferedDataStream.h

@@ -16,7 +16,7 @@
 #include <minidump/minidump_user_extension_stream_data_source.h>
 #include <vector>
 
-namespace Lumberyard
+namespace O3de
 {
     class BufferedDataStream : public crashpad::MinidumpUserExtensionStreamDataSource
     {

Code/Tools/CrashHandler/Uploader/include/Uploader/CrashUploader.h

@@ -28,7 +28,7 @@
 #include <base/logging.h>
 #include <string>
 
-namespace Lumberyard
+namespace O3de
 {
     bool CheckConfirmation(const crashpad::CrashReportDatabase::Report& report);
     void InstallCrashUploader(int& argc, char* argv[]);

Code/Tools/CrashHandler/Uploader/include/Uploader/FileStreamDataSource.h

@@ -16,7 +16,7 @@
 #include <handler/user_stream_data_source.h>
 #include "base/files/file_path.h"
 
-namespace Lumberyard
+namespace O3de
 {
     class FileStreamDataSource : public crashpad::UserStreamDataSource
     {

Code/Tools/CrashHandler/Uploader/src/BufferedDataStream.cpp

@@ -12,7 +12,7 @@
 
 #include <BufferedDataStream.h>
 
-namespace Lumberyard
+namespace O3de
 {
     BufferedDataStream::BufferedDataStream(uint32_t stream_type, const void* data, size_t data_size)
         : crashpad::MinidumpUserExtensionStreamDataSource(stream_type)

Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp

@@ -25,7 +25,7 @@
 #include <memory>
 
 
-namespace Lumberyard
+namespace O3de
 {
     using namespace crashpad;
 

Code/Tools/CrashHandler/Uploader/src/FileStreamDataSource.cpp

@@ -15,7 +15,7 @@
 
 #include <memory>
 
-namespace Lumberyard
+namespace O3de
 {
     FileStreamDataSource::FileStreamDataSource(const base::FilePath& filePath) :
         m_filePath{ filePath }