diff --git a/.hgignore b/.hgignore
index 32639a1458..b60e02f225 100644
--- a/.hgignore
+++ b/.hgignore
@@ -38,6 +38,7 @@ indra/newview/character
indra/newview/fmod.dll
indra/newview/mozilla-theme
indra/newview/mozilla-universal-darwin.tgz
+indra/newview/res/ll_icon.*
indra/newview/res-sdl
indra/newview/vivox-runtime
indra/newview/English.lproj/InfoPlist.strings
diff --git a/.hgtags b/.hgtags
index dfdc850cd2..cf24c4e866 100644
--- a/.hgtags
+++ b/.hgtags
@@ -182,29 +182,14 @@ e1ed60913230dd64269a7f7fc52cbc6004f6d52c 2.8.0-beta1
493d9127ee50e84ba08a736a65a23ca86f7a5b01 2.8.0-release
2c7e459e0c883f8e406b932e41e60097e9ee077e DRTVWR-73_2.8.1-beta1
2c7e459e0c883f8e406b932e41e60097e9ee077e 2.8.1-beta1
+29e93d7e19991011bd12b5748142b11a5dcb4370 DRTVWR-72_2.8.1-release
+29e93d7e19991011bd12b5748142b11a5dcb4370 2.8.1-release
+4780e3bd2b3042f91be3426151f28c30d199bb3b DRTVWR-76_2.8.1-hotfix
+4780e3bd2b3042f91be3426151f28c30d199bb3b 2.8.1-hotfix
54bc7823ad4e3a436fef79710f685a7372bbf795 2.8.2-start
-493d9127ee50e84ba08a736a65a23ca86f7a5b01 2.8.0-release
+29e93d7e19991011bd12b5748142b11a5dcb4370 DRTVWR-72_2.8.1-release
+29e93d7e19991011bd12b5748142b11a5dcb4370 2.8.1-release
ac0f1a132d35c02a58861d37cca75b0429ac9137 2.8.3-start
-4f777ffb99fefdc6497c61385c22688ff149c659 SL-2.0.0
-668851b2ef0f8cf8df07a0fba429e4a6c1e70abb SL-2.0.1
-b03065d018b8a2e28b7de85b293a4c992cb4c12d SL-2.1.0
-bb38ff1a763738609e1b3cada6d15fa61e5e84b9 SL-2.1.1
-1415e6538d54fd5d568ee88343424d57c6803c2c SL-2.2.0
-6ad3d6fa35a4e320e9ce442fce2bf9c7fc852556 SL-2.3.0
-1ed382c6a08ba3850b6ce9061bc551ddece0ea07 SL-2.4.0
-b723921b5c711bd24dbe77dc76ef488b544dac78 SL-2.5.0
-4dede9ae1ec74d41f6887719f6f1de7340d8578d SL-2.5.1
-b53a0576eec80614d7767ed72b40ed67aeff27c9 SL-2.5.2
-42f32494bac475d0737799346f6831558ae8bf5d SL-2.6.0
-c9182ed77d427c759cfacf49a7b71a2e20d522aa SL-2.6.1
-214180ad5714ce8392b82bbebcc92f4babd98300 SL-2.6.2
-8f2da1701c81a62352df2b8d413d27fb2cade9a6 SL-2.6.3
-dac76a711da5f1489a01c1fa62ec97d99c25736d SL-2.6.6
-be2000b946f8cb3de5f44b2d419287d4c48ec4eb SL-2.6.8
-77e5a08344c95738ab879f9671b7758cddd712a3 SL-2.6.9
-a9abb9633a266c8d2fe62411cfd1c86d32da72bf SL-2.7.1
-057f319dd8eccdf63a54d99686c68cdcb31b6abc SL-2.7.4
-6866d9df6efbd441c66451debd376d21211de39c SL-2.7.5
493d9127ee50e84ba08a736a65a23ca86f7a5b01 SL-2-8-0
425f96b1e81e01644bf5e951961e7d1023bffb89 RLVa-1.2.0
fc0cbb86f5bd6e7737159e35aea2c4cf9f619b62 RLVa-1.2.1
@@ -214,3 +199,44 @@ fc0cbb86f5bd6e7737159e35aea2c4cf9f619b62 RLVa-1.2.1
a563f7e215c7883c1cfd20908085687a0ed96284 RLVa-1.4.0
40644beae9c4a617504163d5c9f195dc7bfff1b4 RLVa-1.4.1
637901b23d335e4240c2c1763b45d1df71be84be FSmerge-2.8.3
+599677276b227357140dda35bea4a2c18e2e67b5 DRTVWR-75_2.8.3-beta1
+599677276b227357140dda35bea4a2c18e2e67b5 2.8.3-beta1
+fb85792b84bf28428889c4cc966469d92e5dac4c DRTVWR-74_2.8.3-release
+fb85792b84bf28428889c4cc966469d92e5dac4c 2.8.3-release
+46a010f4885a9d223b511eac553ba5720284b1dc 3.0.0-start
+b0be6ce3adfef3a014a2389d360539f8a86c5439 DRTVWR-78_3.0.0-beta1
+b0be6ce3adfef3a014a2389d360539f8a86c5439 3.0.0-beta1
+6b678ea52f90d5c14181661dcd2546e25bde483e 3.0.0-start
+82a2079ffcb57ecb1b3849cb41376b443e1eb912 3.0.1-start
+364fd63517fbacbbcb9129d096187171ba8c9e48 DRTVWR-81_3.0.1-beta1
+364fd63517fbacbbcb9129d096187171ba8c9e48 3.0.1-beta1
+f2412ecd6740803ea9452f1d17fd872e263a0df7 3.0.2-start
+1778f26b6d0ae762dec3ca37140f66620f2485d9 DRTVWR-78_3.0.0-release
+1778f26b6d0ae762dec3ca37140f66620f2485d9 3.0.0-release
+42784bf50fa01974bada2a1af3892ee09c93fcda DRTVWR-83_3.0.2-beta1
+42784bf50fa01974bada2a1af3892ee09c93fcda 3.0.2-beta1
+e5c9af2d7980a99a71650be3a0cf7b2b3c3b897e DRTVWR-86_3.0.2-beta2
+e5c9af2d7980a99a71650be3a0cf7b2b3c3b897e 3.0.2-beta2
+b95ddac176ac944efdc85cbee94ac2e1eab44c79 3.0.3-start
+1778f26b6d0ae762dec3ca37140f66620f2485d9 DRTVWR-78_3.0.0-release
+0000000000000000000000000000000000000000 DRTVWR-78_3.0.0-release
+1778f26b6d0ae762dec3ca37140f66620f2485d9 DRTVWR-77_3.0.0-release
+6694f3f062aa45f64ab391d25a3eb3d5eb1b0871 DRTVWR-85_3.0.3-beta1
+6694f3f062aa45f64ab391d25a3eb3d5eb1b0871 3.0.3-beta1
+586907287be581817b2422b5137971b22d54ea48 3.0.4-start
+61aa7974df089e8621fe9a4c69bcdefdb3cc208a DRTVWR-89_3.0.3-beta2
+61aa7974df089e8621fe9a4c69bcdefdb3cc208a 3.0.3-beta2
+0496d2f74043cf4e6058e76ac3db03d44cff42ce DRTVWR-84_3.0.3-release
+0496d2f74043cf4e6058e76ac3db03d44cff42ce 3.0.3-release
+92a3aa04775438226399b19deee12ac3b5a62838 3.0.5-start
+c7282e59f374ee904bd793c3c444455e3399b0c5 3.1.0-start
+2657fa785bbfac115852c41bd0adaff74c2ad5da DRTVWR-93_3.1.0-beta1
+2657fa785bbfac115852c41bd0adaff74c2ad5da 3.1.0-beta1
+dbaaef19266478a20654c46395300640163e98e3 DRTVWR-96_3.1.0-beta2
+dbaaef19266478a20654c46395300640163e98e3 3.1.0-beta2
+dbaaef19266478a20654c46395300640163e98e3 DRTVWR-96_3.1.0-beta2
+bc01ee26fd0f1866e266429e85f76340523e91f1 DRTVWR-96_3.1.0-beta2
+dbaaef19266478a20654c46395300640163e98e3 3.1.0-beta2
+bc01ee26fd0f1866e266429e85f76340523e91f1 3.1.0-beta2
+ae2de7b0b33c03dc5bdf3a7bfa54463b512221b2 DRTVWR-92_3.1.0-release
+ae2de7b0b33c03dc5bdf3a7bfa54463b512221b2 3.1.0-release
diff --git a/BuildParams b/BuildParams
old mode 100755
new mode 100644
index 58852110ef..1c76b6f935
--- a/BuildParams
+++ b/BuildParams
@@ -42,9 +42,17 @@ snowstorm_viewer-development.viewer_channel = "Second Life Development"
snowstorm_viewer-development.login_channel = "Second Life Development"
snowstorm_viewer-development.build_viewer_update_version_manager = false
snowstorm_viewer-development.email = viewer-development-builds@lists.secondlife.com
+snowstorm_viewer-development.build_enforce_coding_policy = true
+snowstorm_viewer-development.codeticket_add_context = true
+
+Snowstorm_viewer-project-review.build_debug_release_separately = true
+Snowstorm_viewer-project-review.codeticket_add_context = true
+Snowstorm_viewer-project-review.viewer_channel = "Project Viewer - Snowstorm Team"
+Snowstorm_viewer-project-review.login_channel = "Project Viewer - Snowstorm Team"
+Snowstorm_viewer-project-review.codeticket_add_context = true
# ========================================
-# Viewer Beta
+# Viewer Beta (Owner: Dessie Linden)
# ========================================
viewer-beta.viewer_channel = "Second Life Beta Viewer"
viewer-beta.login_channel = "Second Life Beta Viewer"
@@ -58,7 +66,7 @@ viewer-pre-beta.build_viewer_update_version_manager = true
# ========================================
-# Viewer Release
+# Viewer Release (Owner: Dessie Linden)
# ========================================
viewer-release.viewer_channel = "Second Life Release"
viewer-release.login_channel = "Second Life Release"
@@ -69,7 +77,7 @@ viewer-pre-release.viewer_channel = "Second Life Release"
viewer-pre-release.login_channel = "Second Life Release"
viewer-pre-release.build_debug_release_separately = true
viewer-pre-release.build_viewer_update_version_manager = true
-#viewer-pre-release.release-viewer.jira = DRTVWR-46
+#viewer-pre-release.release-viewer.jira = DRTVWR-92
# ========================================
@@ -140,12 +148,9 @@ cg_viewer-development_lenny.email = cg@lindenlab.com
# oz
# ================
-snowstorm_project-windlight.build_debug_release_separately = true
-snowstorm_project-windlight.viewer_channel = "Second Life Project Windlight Region"
-snowstorm_project-windlight.login_channel = "Second Life Project Windlight Region"
-
oz_viewer-devreview.build_debug_release_separately = true
oz_viewer-devreview.codeticket_add_context = false
+oz_viewer-devreview.build_enforce_coding_policy = true
oz_project-1.build_debug_release_separately = true
oz_project-1.codeticket_add_context = false
@@ -158,9 +163,8 @@ oz_project-4.codeticket_add_context = false
oz_viewer-beta-review.build_debug_release_separately = true
oz_viewer-beta-review.codeticket_add_context = false
-
-oz_viewer-poreview.build_debug_release_separately = true
-oz_viewer-poreview.codeticket_add_context = false
+oz_viewer-beta-review.viewer_channel = "Second Life Beta Viewer"
+oz_viewer-beta-review.login_channel = "Second Life Beta Viewer"
# =================================================================
# asset delivery 2010 projects
diff --git a/autobuild.xml b/autobuild.xml
index cf76400c34..a41acfb731 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1112,7 +1112,7 @@
hash
362654a472ef7368d4c803ae3fb89d95
url
- http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/238959/arch/Darwin/installer/llconvexdecomposition-0.1-darwin-20110819.tar.bz2
+ http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/238959/arch/Darwin/installer/llconvexdecomposition-0.1-darwin-20110819.tar.bz2
name
darwin
@@ -1124,7 +1124,7 @@
hash
c7801d899daec5338fbe95053255b7e7
url
- http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/238959/arch/Linux/installer/llconvexdecomposition-0.1-linux-20110819.tar.bz2
+ http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/238959/arch/Linux/installer/llconvexdecomposition-0.1-linux-20110819.tar.bz2
name
linux
@@ -1136,7 +1136,7 @@
hash
6ecf2f85f03c5ae87fe45769566a5660
url
- http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/238959/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110819.tar.bz2
+ http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-llconvexdecomposition/rev/238959/arch/CYGWIN/installer/llconvexdecomposition-0.1-windows-20110819.tar.bz2
name
windows
@@ -1160,7 +1160,7 @@
hash
a5f53e09f67271fd50f1131ffdda9d27
url
- http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/238958/arch/Darwin/installer/llconvexdecompositionstub-0.3-darwin-20110819.tar.bz2
+ http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/238958/arch/Darwin/installer/llconvexdecompositionstub-0.3-darwin-20110819.tar.bz2
name
darwin
@@ -1172,7 +1172,7 @@
hash
0006a964f1497f55a5f181b7042d2d22
url
- http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/238958/arch/Linux/installer/llconvexdecompositionstub-0.3-linux-20110819.tar.bz2
+ http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/238958/arch/Linux/installer/llconvexdecompositionstub-0.3-linux-20110819.tar.bz2
name
linux
@@ -1184,7 +1184,7 @@
hash
b859e7e3bb03ebb467f0309f46422995
url
- http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/238958/arch/CYGWIN/installer/llconvexdecompositionstub-0.3-windows-20110819.tar.bz2
+ http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llconvexdecompositionstub/rev/238958/arch/CYGWIN/installer/llconvexdecompositionstub-0.3-windows-20110819.tar.bz2
name
windows
@@ -2069,12 +2069,12 @@