Merge branch 'Firestorm_Release_7.1.11' of https://github.com/FirestormViewer/phoenix-firestorm into Heuguchon_1.0.0

# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/growlnotifierwin.cpp
#	scripts/configure_heuguchon.sh

Author: heuguchon

.clang-format

@@ -40,7 +40,7 @@ CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
+Cpp11BracedListStyle: false
 DeriveLineEnding: true
 DerivePointerAlignment: false
 DisableFormat:   false
@@ -87,15 +87,15 @@ PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 1000
-PointerAlignment: Right
+PointerAlignment: Left
 ReflowComments:  true
 SortIncludes:    false
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: true
+SpaceBeforeCpp11BracedList: false
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements

.git-blame-ignore-revs

@@ -0,0 +1,11 @@
+# Replace tabs with spaces
+1b68f71348ecf3983b76b40d7940da8377f049b7
+33418a77b716e122da9778869cdbabe97c83ff37
+# Trim trailing whitespace
+a0b3021bdcf76859054fda8e30abb3ed47749e83
+8444cd9562a6a7b755fcb075864e205122354192
+863c541ce0b2e3e1e566cc88423d3e87aaedb6ca
+# Wrong line endings
+1b67dd855c41f5a0cda7ec2a68d98071986ca703
+6cc7dd09d5e69cf57e6de7fb568a0ad2693f9c9a
+e2e37cced861b98de8c1a7c9c0d3a50d2d90e433

.gitattributes

@@ -33,3 +33,6 @@ FILES_ARE_UNICODE_UTF-16LE.txt text eol=crlf
 
 # Windows Manifest files
 *.manifest text eol=crlf
+
+# Windows Installer Script files (normalization disabled)
+*.nsi -text

.github/labeler.yaml

@@ -1,6 +1,6 @@
 llappearance:
   - indra/llappearance/**/*
-  
+
 llaudio:
   - indra/llaudio/**/*
 
@@ -76,3 +76,6 @@ c/cpp:
   - '**/*.i'
   - '**/*.inl'
   - '**/*.y'
+
+'team:viewer':
+  - '*'

.github/pull_request_template.md

@@ -0,0 +1,4 @@
+## Firestorm Pull Request Checklist
+Thank you for contributing to the Phoenix Firestorm Project.
+We will endeavour to review you changes and accept/reject/request changes as soon as possible. 
+Please read and follow the [Firestorm Pull Request Guidelines](https://github.com/firestormviewer/phoenix-firestorm/blob/master/FS_PR_GUIDELINES.md) to reduce the likelihood that we need to ask for "Bureaucratic" changes to make the code comply with our workflows.