diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 2914667f2..202cd463b 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 5;
-const S32 LL_VERSION_PATCH = 1;
+const S32 LL_VERSION_PATCH = 2;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Singularity Viewer";
diff --git a/indra/newview/app_settings/default_grids.xml b/indra/newview/app_settings/default_grids.xml
new file mode 100755
index 000000000..3f44e4b90
--- /dev/null
+++ b/indra/newview/app_settings/default_grids.xml
@@ -0,0 +1,236 @@
+<llsd>
+  <array>
+    <map>
+      <key>default_grids_version</key><string>26</string>
+    </map>
+
+    <!-- Second Life -->
+    <map>
+      <key>gridnick</key><string>secondlife</string>
+      <key>gridname</key><string>Second Life</string>
+      <key>platform</key><string>SecondLife</string>
+      <key>loginuri</key><string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>
+      <key>loginpage</key><string>http://imprudenceviewer.org/app/splash/</string>
+      <key>helperuri</key><string>https://secondlife.com/helpers/</string>
+      <key>website</key><string>http://secondlife.com/</string>
+      <key>support</key><string>http://secondlife.com/support/</string>
+      <key>register</key><string>http://secondlife.com/registration/</string>
+      <key>password</key><string>http://secondlife.com/account/request.php</string>
+      <key>version</key><string>0</string>
+    </map>
+
+    <!-- Second Life Beta -->
+    <map>
+      <key>gridnick</key><string>secondlifebeta</string>
+      <key>gridname</key><string>Second Life Beta Grid</string>
+      <key>platform</key><string>SecondLife</string>
+      <key>loginuri</key><string>https://login.aditi.lindenlab.com/cgi-bin/login.cgi</string>
+      <key>loginpage</key><string>http://imprudenceviewer.org/app/splash/</string>
+      <key>helperuri</key><string>http://aditi-secondlife.webdev.lindenlab.com/helpers/</string>
+      <key>website</key><string>http://secondlife.com/</string>
+      <key>support</key><string>http://secondlife.com/support/</string>
+      <key>register</key><string>http://secondlife.com/registration/</string>
+      <key>password</key><string>http://secondlife.com/account/request.php</string>
+      <key>version</key><string>1</string>
+    </map>
+
+    <!-- Local Host -->
+    <map>
+      <key>gridnick</key><string>localhost</string>
+      <key>gridname</key><string>Local Host</string>
+      <key>platform</key><string>OpenSim</string>
+      <key>loginuri</key><string>http://127.0.0.1:9000/</string>
+      <key>loginpage</key><string />
+      <key>helperuri</key><string>http://127.0.0.1:9000/</string>
+      <key>version</key><string>1</string>
+    </map>
+
+    <!-- OSGrid -->
+    <map>
+      <key>gridnick</key><string>osgrid</string>
+      <key>gridname</key><string>OSGrid</string>
+      <key>platform</key><string>OpenSim</string>
+      <key>loginuri</key><string>http://login.osgrid.org/</string>
+      <key>loginpage</key><string>http://osgrid.org/splash/</string>
+      <key>helperuri</key><string>http://helper.osgrid.org/</string>
+      <key>website</key><string>http://osgrid.org/</string>
+      <key>support</key><string>http://osgrid.org/</string>
+      <key>register</key><string>http://www.osgrid.org/index.php/auth/register</string>
+      <key>password</key><string>http://www.osgrid.org/index.php/auth/forgot_password</string>
+      <key>version</key><string>1</string>
+    </map>
+
+    <!-- Legend City Online -->
+    <map>
+      <key>gridnick</key><string>legendcityonline</string>
+      <key>gridname</key><string>Legend City Online</string>
+      <key>platform</key><string>OpenSim</string>
+      <key>loginuri</key><string>http://login.legendcityonline.com</string>
+      <key>loginpage</key><string>http://www.legendcityonline.com/welcome.php</string>
+      <key>helperuri</key><string>https://secure.legendcityonline.com/</string>
+      <key>website</key><string>http://www.legendcityonline.com/</string>
+      <key>support</key><string>http://www.legendcityonline.com/</string>
+      <key>register</key><string>http://www.legendcityonline.com/</string>
+      <key>password</key><string>http://www.legendcityonline.com/</string>
+      <key>version</key><string>0</string>
+    </map>
+
+    <!-- WorldSimTerra -->
+    <map>
+      <key>gridnick</key><string>worldsimterra</string>
+      <key>gridname</key><string>WorldSimTerra</string>
+      <key>platform</key><string>OpenSim</string>
+      <key>loginuri</key><string>http://wsterra.com:8002</string>
+      <key>loginpage</key><string>http://wsterra.com/log.php</string>
+      <key>helperuri</key><string>http://wsterra.com/</string>
+      <key>website</key><string>http://www.worldsimterra.com/</string>
+      <key>support</key><string>http://www.worldsimterra.com/</string>
+      <key>register</key><string>http://www.worldsimterra.com/</string>
+      <key>password</key><string>http://www.worldsimterra.com/</string>
+      <key>version</key><string>0</string>
+    </map>
+
+    <!-- Your Alternative Life -->
+    <map>
+      <key>gridnick</key><string>youralternativelife</string>
+      <key>gridname</key><string>Your Alternative Life</string>
+      <key>platform</key><string>OpenSim</string>
+      <key>loginuri</key><string>http://grid01.from-ne.com:8002/</string>
+      <key>loginpage</key><string>http://grid01.from-ne.com/tios/loginscreen3.php</string>
+      <key>helperuri</key><string>http://grid01.from-ne.com/tios/services/</string>
+      <key>website</key><string>http://www.youralternativelife.com</string>
+      <key>support</key><string>http://www.youralternativelife.com</string>
+      <key>register</key><string>http://www.youralternativelife.com</string>
+      <key>password</key><string>http://www.youralternativelife.com</string>
+      <key>version</key><string>0</string>
+
+    </map>
+
+    <!-- The New World Grid -->
+    <map>
+      <key>gridnick</key><string>thenewworldgrid</string>
+      <key>gridname</key><string>The New World Grid</string>
+      <key>platform</key><string>OpenSim</string>
+      <key>loginuri</key><string>http://grid.newworldgrid.com:8002/</string>
+      <key>loginpage</key><string>http://account.newworldgrid.com/loginscreen.php</string>
+      <key>helperuri</key><string>http://account.newworldgrid.com/</string>
+      <key>website</key><string>http://www.newworldgrid.com/</string>
+      <key>support</key><string>http://www.newworldgrid.com/</string>
+      <key>register</key><string>http://www.newworldgrid.com/register</string>
+      <key>password</key><string>http://account.newworldgrid.com/</string>
+      <key>version</key><string>0</string>
+    </map>
+
+    <!-- ReactionGrid -->
+    <map>
+      <key>gridnick</key><string>reactiongrid</string>
+      <key>gridname</key><string>ReactionGrid</string>
+      <key>platform</key><string>OpenSim</string>
+      <key>loginuri</key><string>http://reactiongrid.com:8008/</string>
+      <key>loginpage</key><string>http://gsquared.info/portal</string>
+      <key>website</key><string>http://reactiongrid.com/Default.aspx</string>
+      <key>support</key><string>http://reactiongrid.com/Support.aspx</string>
+      <key>register</key><string>http://reactiongrid.com/Register.aspx</string>
+      <key>password</key><string>http://reactiongrid.com/Support/ResetPassword.aspx</string>
+      <key>version</key><string>0</string>
+    </map>
+
+    <!-- Cyberlandia -->
+    <map>
+      <key>gridnick</key><string>cyberlandia</string>
+      <key>gridname</key><string>Cyberlandia</string>
+      <key>platform</key><string>OpenSim</string>
+      <key>loginuri</key><string>http://grid.cyberlandia.net:8002</string>
+      <key>loginpage</key><string></string>
+      <key>helperuri</key><string></string>
+      <key>website</key><string>http://www.cyberlandia.net</string>
+      <key>version</key><string>0</string>
+    </map>
+
+    <!-- Role Play Worlds -->
+    <map>
+      <key>gridnick</key><string>roleplayworlds</string>
+      <key>gridname</key><string>Role Play Worlds</string>
+      <key>platform</key><string>OpenSim</string>
+      <key>loginuri</key><string>http://grid.roleplayworlds.net:8002/</string>
+      <key>loginpage</key><string>http://grid.roleplayworlds.net/loginscreen.php</string>
+      <key>helperuri</key><string>http://grid.roleplayworlds.net/</string>
+      <key>website</key><string>http://roleplayworlds.net/</string>
+      <key>register</key><string>http://grid.roleplayworlds.net/index.php?page=create</string>
+      <key>password</key><string>http://grid.roleplayworlds.net/index.php?page=change</string>
+      <key>version</key><string>0</string>
+    </map>
+
+    <!-- GiantGrid -->
+    <map>
+      <key>gridnick</key><string>giantgrid</string>
+      <key>gridname</key><string>GiantGrid</string>
+      <key>platform</key><string>OpenSim</string>
+      <key>loginuri</key><string>http://Gianttest.no-ip.biz:8002/</string>
+      <key>loginpage</key><string>http://gianttest.no-ip.biz:80/gridsplash?method=login</string>
+      <key>helperuri</key><string>http://gianttest.no-ip.biz/giantmap/</string>
+      <key>version</key><string>0</string>
+    </map>
+
+    <!-- 3rd Rock Grid -->
+    <map>
+      <key>gridnick</key><string>3rdrock</string>
+      <key>gridname</key><string>3rd Rock Grid</string>
+      <key>platform</key><string>OpenSim</string>
+      <key>loginuri</key><string>http://grid.3rdrockgrid.com:8002/</string>
+      <key>loginpage</key><string>http://3rdrockgrid.com/startpage.php</string>
+      <key>helperuri</key><string>http://grid.3rdrockgrid.com/money/</string>
+      <key>website</key><string>http://3rdrockgrid.com/</string>
+      <key>register</key><string>http://3rdrockgrid.com/</string>
+      <key>password</key><string>http://3rdrockgrid.com/</string>
+      <key>support</key><string>http://3rdrockgrid.com/</string>
+      <key>version</key><string>1</string>
+    </map>
+
+    <!-- InWorldz -->
+    <map>
+      <key>gridname</key>  <string>Inworldz</string>
+      <key>gridnick</key>  <string>inworldz</string>
+      <key>platform</key>  <string>OpenSim</string>
+      <key>loginuri</key>  <string>http://inworldz.com:8002/</string>
+      <key>loginpage</key> <string>http://inworldz.com/loginscreen.php</string>
+      <key>helperuri</key> <string>http://inworldz.com/</string>
+      <key>password</key>  <string>http://inworldz.com/wpassword</string>
+      <key>register</key>  <string>http://inworldz.com/register</string>
+      <key>support</key>   <string>http://inworldz.com/help</string>
+      <key>website</key>   <string>http://inworldz.com/about/</string>
+      <key>version</key>   <string>1</string>
+    </map> 
+
+    <!-- Meta7 -->
+    <map>
+      <key>gridname</key>  <string>Meta7</string>
+      <key>gridnick</key>  <string>meta7</string>
+      <key>platform</key>  <string>OpenSim</string>
+      <key>loginuri</key>  <string>http://login.meta7.com/</string>
+      <key>loginpage</key> <string>http://api.meta7.com/loginscreen.php</string>
+      <key>helperuri</key> <string>https://secure.meta7.com/</string>
+      <key>password</key>  <string>http://www.meta7.com/resetpass.php</string>
+      <key>register</key>  <string>http://www.meta7.com/register.php</string>
+      <key>support</key>   <string>http://www.meta7.com/support.php</string>
+      <key>website</key>   <string>http://meta7.com/</string>
+      <key>version</key>   <string>0</string>
+    </map>
+
+    <!-- ScienceSim -->
+    <map>
+      <key>gridname</key>  <string>IEEE/ACM ScienceSim Virtual World</string>
+      <key>gridnick</key>  <string>sciencesim</string>
+      <key>platform</key>  <string>OpenSim</string>
+      <key>loginuri</key>  <string>http://grid.sciencesim.com/</string>
+      <key>loginpage</key> <string>http://island.sciencesim.com/scisim/loginscreen.php</string>
+      <key>helperuri</key> <string></string>
+      <key>password</key>  <string>http://island.sciencesim.com/scisim</string>
+      <key>register</key>  <string>http://island.sciencesim.com/scisim</string>
+      <key>support</key>   <string>http://island.sciencesim.com/wiki</string>
+      <key>website</key>   <string>http://island.sciencesim.com/about/</string>
+      <key>version</key>   <string>0</string>
+    </map>
+
+  </array>
+</llsd>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a4f8aac4a..407249640 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6055,7 +6055,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>ForceMandatoryUpdate</key>
     <map>
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index a304264fa..8da785d37 100644
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -53,11 +53,11 @@ ATI ASUS EAH48xx				.*ATI.*ASUS.*EAH48.*				3		1
 ATI ASUS EAH57xx				.*ATI.*ASUS.*EAH57.*				3		1
 ATI ASUS EAH58xx				.*ATI.*ASUS.*EAH58.*				3		1
 ATI Radeon X1xxx				.*ATI.*ASUS.*X1.*					2		1
-ATI Radeon X7xx					.*ATI.*ASUS.*X7.*					1		1
-ATI Radeon X500					.*ATI.*Diamond X5.*					1		1
-ATI Radeon X13xx				.*ATI.*Diamond X13.*				1		1
-ATI Radeon X16xx				.*ATI.*Diamond X16.*				1		1
-ATI Radeon X19xx				.*ATI.*Diamond X19.*				1		1
+ATI Radeon X700					.*ATI.*ASUS.*X7.*					1		1
+ATI Radeon X500					.*ATI.*X5.*							1		1
+ATI Radeon X1300				.*ATI.*X13.*						1		1
+ATI Radeon X1600				.*ATI.*X16.*						1		1
+ATI Radeon X1900				.*ATI.*X19.*						1		1
 ATI Display Adapter				.*ATI.*display adapter.*			0		1
 ATI FireGL 5200					.*ATI.*FireGL V52.*					0		1
 ATI FireGL 5xxx					.*ATI.*FireGL V5.*					1		1
@@ -73,47 +73,69 @@ ATI M71							.*ATI.*M71.*						1		1
 ATI M72							.*ATI.*M72.*						1		1
 ATI M76							.*ATI.*M76.*						3		1
 ATI Mobility Radeon 4100		.*ATI.*Mobility *41.*				0		1
-ATI Mobility Radeon 7xxx		.*ATI.*Mobility *Radeon 7.*			0		1
-ATI Mobility Radeon 8xxx		.*ATI.*Mobility *Radeon 8.*			0		1
-ATI Mobility Radeon 9800		.*ATI.*Mobility *98.*				1		1
-ATI Mobility Radeon 9700		.*ATI.*Mobility *97.*				1		1
-ATI Mobility Radeon 9600		.*ATI.*Mobility *96.*				0		1
-ATI Mobility Radeon HD 2300		.*ATI.*Mobility *HD *23.*			1		1
-ATI Mobility Radeon HD 2400		.*ATI.*Mobility *HD *24.*			1		1
-ATI Mobility Radeon HD 2600		.*ATI.*Mobility *HD *26.*			3		1
-ATI Mobility Radeon HD 3400		.*ATI.*Mobility *HD *34.*			1		1
-ATI Mobility Radeon HD 3600		.*ATI.*Mobility *HD *36.*			3		1
-ATI Mobility Radeon HD 3800		.*ATI.*Mobility *HD *38.*			3		1
-ATI Mobility Radeon HD 5400		.*ATI.*Mobility *HD *54.*			1		1
-ATI Mobility Radeon HD 5500		.*ATI.*Mobility *HD *55.*			1		1
-ATI Mobility Radeon X1xxx		.*ATI.*Mobility *X1.*				0		1
-ATI Mobility Radeon X2xxx		.*ATI.*Mobility *X2.*				0		1
-ATI Mobility Radeon X3xx		.*ATI.*Mobility *X3.*				1		1
-ATI Mobility Radeon X6xx		.*ATI.*Mobility *X6.*				1		1
-ATI Mobility Radeon X7xx		.*ATI.*Mobility *X7.*				1		1
-ATI Mobility Radeon Xxxx		.*ATI.*Mobility *X.*				0		1
+ATI Mobility Radeon 7xxx		.*ATI.*Mobility.*Radeon 7.*			0		1
+ATI Mobility Radeon 8xxx		.*ATI.*Mobility.*Radeon 8.*			0		1
+ATI Mobility Radeon 9800		.*ATI.*Mobility.*98.*				1		1
+ATI Mobility Radeon 9700		.*ATI.*Mobility.*97.*				1		1
+ATI Mobility Radeon 9600		.*ATI.*Mobility.*96.*				0		1
+ATI Mobility Radeon HD 2300		.*ATI.*Mobility.*HD.*23.*			1		1
+ATI Mobility Radeon HD 2400		.*ATI.*Mobility.*HD.*24.*			1		1
+ATI Mobility Radeon HD 2600		.*ATI.*Mobility.*HD.*26.*			2		1
+ATI Mobility Radeon HD 2700		.*ATI.*Mobility.*HD.*27.*			3		1
+ATI Mobility Radeon HD 3100		.*ATI.*Mobility.*HD.*31.*			1		1
+ATI Mobility Radeon HD 3200		.*ATI.*Mobility.*HD.*32.*			1		1
+ATI Mobility Radeon HD 3400		.*ATI.*Mobility.*HD.*34.*			2		1
+ATI Mobility Radeon HD 3600		.*ATI.*Mobility.*HD.*36.*			2		1
+ATI Mobility Radeon HD 3800		.*ATI.*Mobility.*HD.*38.*			3		1
+ATI Mobility Radeon HD 4200		.*ATI.*Mobility.*HD.*42.*			2		1
+ATI Mobility Radeon HD 4300		.*ATI.*Mobility.*HD.*43.*			2		1
+ATI Mobility Radeon HD 4500		.*ATI.*Mobility.*HD.*45.*			3		1
+ATI Mobility Radeon HD 4600		.*ATI.*Mobility.*HD.*46.*			3		1
+ATI Mobility Radeon HD 4800		.*ATI.*Mobility.*HD.*48.*			3		1
+ATI Mobility Radeon HD 5100		.*ATI.*Mobility *HD *51.*			2		1
+ATI Mobility Radeon HD 5300		.*ATI.*Mobility *HD *53.*			2		1
+ATI Mobility Radeon HD 5400		.*ATI.*Mobility *HD *54.*			2		1
+ATI Mobility Radeon HD 5500		.*ATI.*Mobility *HD *55.*			2		1
+ATI Mobility Radeon HD 5600		.*ATI.*Mobility *HD *56.*			2		1
+ATI Mobility Radeon HD 5700		.*ATI.*Mobility *HD *57.*			3		1
+ATI Mobility Radeon HD 5800		.*ATI.*Mobility *HD *58.*			3		1
+ATI Mobility Radeon X1xxx		.*ATI.*Mobility.*X1.*				0		1
+ATI Mobility Radeon X2xxx		.*ATI.*Mobility.*X2.*				0		1
+ATI Mobility Radeon X3xx		.*ATI.*Mobility.*X3.*				1		1
+ATI Mobility Radeon X6xx		.*ATI.*Mobility.*X6.*				1		1
+ATI Mobility Radeon X7xx		.*ATI.*Mobility.*X7.*				1		1
+ATI Mobility Radeon Xxxx		.*ATI.*Mobility.*X.*				0		1
 ATI Mobility Radeon				.*ATI.*Mobility.*					0		1
-ATI Radeon HD 2300				.*ATI.*Radeon HD *23.*				0		1
-ATI Radeon HD 2400				.*ATI.*Radeon HD *24.*				1		1
-ATI Radeon HD 2600				.*ATI.*Radeon HD *26.*				2		1
-ATI Radeon HD 2900				.*ATI.*Radeon HD *29.*				3		1
-ATI Radeon HD 3200				.*ATI.*Radeon.*HD *32.*				1		1
-ATI Radeon HD 3300				.*ATI.*Radeon HD *33.*				1		1
-ATI Radeon HD 3400				.*ATI.*Radeon HD *34.*				1		1
-ATI Radeon HD 3600				.*ATI.*Radeon HD *36.*				3		1
-ATI Radeon HD 3800				.*ATI.*Radeon HD *38.*				3		1
+ATI Radeon HD 2300				.*ATI.*Radeon HD 23.*				0		1
+ATI Radeon HD 2400				.*ATI.*Radeon HD.*24.*				1		1
+ATI Radeon HD 2600				.*ATI.*Radeon HD 26.*				2		1
+ATI Radeon HD 2900				.*ATI.*Radeon HD 29.*				3		1
+ATI Radeon HD 3000				.*ATI.*Radeon.*HD.*30.*				0		1
+ATI Radeon HD 3100				.*ATI.*Radeon.*HD.*31.*				1		1
+ATI Radeon HD 3200				.*ATI.*Radeon.*HD.*32.*				1		1
+ATI Radeon HD 3300				.*ATI.*Radeon HD.*33.*				1		1
+ATI Radeon HD 3400				.*ATI.*Radeon HD.*34.*				1		1
+ATI Radeon HD 3600				.*ATI.*Radeon HD.*36.*				3		1
+ATI Radeon HD 3800				.*ATI.*Radeon HD.*38.*				3		1
 ATI Radeon HD 4200				.*ATI.*Radeon HD *42.*				1		1
-ATI Radeon HD 4300				.*ATI.*Radeon HD *43.*				1		1
-ATI Radeon HD 4500				.*ATI.*Radeon HD *45.*				2		1
-ATI Radeon HD 4600				.*ATI.*Radeon HD *46.*				3		1
+ATI Radeon HD 4300				.*ATI.*Radeon HD 43.*				1		1
+ATI Radeon HD 4500				.*ATI.*Radeon HD 45.*				2		1
+ATI Radeon HD 4600				.*ATI.*Radeon HD 46.*				3		1
 ATI Radeon HD 4700				.*ATI.*Radeon HD *47.*				3		1
-ATI Radeon HD 4800				.*ATI.*Radeon.*HD *48.*				3		1
-ATI Radeon HD 5400				.*ATI.*Radeon.*HD *54.*				3		1
-ATI Radeon HD 5500				.*ATI.*Radeon.*HD *55.*				3		1
-ATI Radeon HD 5600				.*ATI.*Radeon.*HD *56.*				3		1
-ATI Radeon HD 5700				.*ATI.*Radeon.*HD *57.*				3		1
-ATI Radeon HD 5800				.*ATI.*Radeon.*HD *58.*				3		1
-ATI Radeon HD 5900				.*ATI.*Radeon.*HD *59.*				3		1
+ATI Radeon HD 4800				.*ATI.*Radeon.*HD.*48.*				3		1
+ATI Radeon HD 5400				.*ATI.*Radeon.*HD.*54.*				2		1
+ATI Radeon HD 5500				.*ATI.*Radeon.*HD.*55.*				2		1
+ATI Radeon HD 5600				.*ATI.*Radeon.*HD.*56.*				3		1
+ATI Radeon HD 5700				.*ATI.*Radeon.*HD.*57.*				3		1
+ATI Radeon HD 5800				.*ATI.*Radeon.*HD.*58.*				3		1
+ATI Radeon HD 5900				.*ATI.*Radeon.*HD.*59.*				3		1
+ATI Radeon HD 6200				.*ATI.*Radeon.*HD.*62.*				2		1
+ATI Radeon HD 6300M				.*ATI.*Radeon.*HD.*6300M.*			2		1
+ATI Radeon HD 6300				.*ATI.*Radeon.*HD.*63.*				2		1
+ATI Radeon HD 6500M				.*ATI.*Radeon.*HD.*6500M.*			2		1
+ATI Radeon HD 6500				.*ATI.*Radeon.*HD.*65.*				3		1
+ATI Radeon HD 6800				.*ATI.*Radeon.*HD.*68.*				3		1
+ATI Radeon HD 6900				.*ATI.*Radeon.*HD.*69.*				3		1
 ATI Radeon OpenGL				.*ATI.*Radeon OpenGL.* 				0		0
 ATI Radeon 2100					.*ATI.*Radeon 21.*					0		1
 ATI Radeon 3000					.*ATI.*Radeon 30.*					0		1
@@ -136,12 +158,12 @@ ATI Radeon VE					.*ATI.*Radeon.*VE.*					0		0
 ATI Radeon X1000				.*ATI.*Radeon *X10.*				0		1
 ATI Radeon X1200				.*ATI.*Radeon *X12.*				0		1
 ATI Radeon X1300				.*ATI.*Radeon *X13.*				1		1
-ATI Radeon X1400				.*ATI.*Radeon *X14.*				1		1
-ATI Radeon X1500				.*ATI.*Radeon *X15.*				1		1
+ATI Radeon X1400				.*ATI.*Radeon X14.*					1		1
+ATI Radeon X1500				.*ATI.*Radeon X15.*					1		1
 ATI Radeon X1600				.*ATI.*Radeon *X16.*				1		1
-ATI Radeon X1700				.*ATI.*Radeon *X17.*				1		1
-ATI Radeon X1800				.*ATI.*Radeon *X18.*				3		1
-ATI Radeon X1900				.*ATI.*Radeon *X19.*				3		1
+ATI Radeon X1700				.*ATI.*Radeon X17.*					1		1
+ATI Radeon X1800				.*ATI.*Radeon X18.*					3		1
+ATI Radeon X1900				.*ATI.*Radeon X19.*					3		1
 ATI Radeon X300					.*ATI.*Radeon *X3.*					0		1
 ATI Radeon X400					.*ATI.*Radeon X4.*					0		1
 ATI Radeon X500					.*ATI.*Radeon X5.*					0		1
@@ -184,39 +206,81 @@ Intel Pineview					.*Intel.*Pineview.*					0		1
 Intel Springdale				.*Intel.*Springdale.*				0		0
 Matrox							.*Matrox.*							0		0
 Mesa							.*Mesa.*							0		0
-NVIDIA 210						.*NVIDIA.*GeForce.*210.*			3		1
-NVIDIA 310						.*NVIDIA.*GeForce.*310.*			3		1
-NVIDIA 315						.*NVIDIA.*GeForce.*315.*			3		1
-NVIDIA G100						.*NVIDIA.*GeForce G *100.*			2		1
+NVIDIA 205						.*NVIDIA.*GeForce.*20.*				2		1
+NVIDIA 210						.*NVIDIA.*GeForce.*21.*				2		1
+NVIDIA 315M						.*NVIDIA.*GeForce 315M.*			0		1
 NVIDIA 310M						.*NVIDIA.*GeForce 310M.*			0		1
 NVIDIA 310						.*NVIDIA.*GeForce 310.*				0		1
+NVIDIA 315						.*NVIDIA.*GeForce 310.*				0		1
 NVIDIA 320M						.*NVIDIA.*GeForce 320M.*			0		1
-NVIDIA G100M					.*NVIDIA.*GeForce G *100M.*			0		1
-NVIDIA G102M					.*NVIDIA.*GeForce G *102M.*			0		1
-NVIDIA G103M					.*NVIDIA.*GeForce G *103M.*			0		1
-NVIDIA G105M					.*NVIDIA.*GeForce G *105M.*			0		1
-NVIDIA G210M					.*NVIDIA.*GeForce G210M.*			0		1
-NVIDIA GT 120					.*NVIDIA.*GeForce GT 12.*			0		1
-NVIDIA GT 130					.*NVIDIA.*GeForce GT 13.*			1		1
-NVIDIA GT 220					.*NVIDIA.*GeForce GT 22.*			0		1
-NVIDIA GT 230					.*NVIDIA.*GeForce GT 23.*			1		1
-NVIDIA GT 240					.*NVIDIA.*GeForce GT 24.*			1		1
-NVIDIA GT 320					.*NVIDIA.*GeForce GT 32.*			0		1
-NVIDIA GT 330					.*NVIDIA.*GeForce GT 33.*			3		1
-NVIDIA GT 340					.*NVIDIA.*GeForce GT 34.*			3		1
-NVIDIA GT 330M					.*NVIDIA.*GeForce GT 330M.*			1		1
-NVIDIA GTS 150					.*NVIDIA.*GeForce GTS 15.*			3		1
-NVIDIA GTS 205					.*NVIDIA.*GeForce GTS 10.*			3		1
-NVIDIA GTS 240					.*NVIDIA.*GeForce GTS 24.*			1		1
-NVIDIA GTS 250					.*NVIDIA.*GeForce GTS 25.*			3		1
-NVIDIA GTS 360M					.*NVIDIA.*GeForce GTS 360M.*		3		1
-NVIDIA GTX 260					.*NVIDIA.*GeForce GTX 26.*			3		1
-NVIDIA GTX 270					.*NVIDIA.*GeForce GTX 27.*			3		1
-NVIDIA GTX 280					.*NVIDIA.*GeForce GTX 28.*			3		1
-NVIDIA GTX 290					.*NVIDIA.*GeForce GTX 29.*			3		1
-NVIDIA GTX 460					.*NVIDIA.*GeForce GTX 46.*			3		1
-NVIDIA GTX 470					.*NVIDIA.*GeForce GTX 47.*			3		1
-NVIDIA GTX 480					.*NVIDIA.*GeForce GTX 48.*			3		1
+NVIDIA G 100M					.*NVIDIA.*GeForce G *100M.*			0		1
+NVIDIA G 102M					.*NVIDIA.*GeForce G *102M.*			0		1
+NVIDIA G 103M					.*NVIDIA.*GeForce G *103M.*			0		1
+NVIDIA G 105M					.*NVIDIA.*GeForce G *105M.*			0		1
+NVIDIA G 110M					.*NVIDIA.*GeForce G *110M.*			0		1
+NVIDIA G 210M					.*NVIDIA.*GeForce G *210M.*			0		1
+NVIDIA GT 120M					.*NVIDIA.*GeForce.*GT.*120M.*		2		1
+NVIDIA GT 120					.*NVIDIA.*GeForce.*GT.*12.*			2		1
+NVIDIA GT 130M					.*NVIDIA.*GeForce.*GT.*130M.*		2		1
+NVIDIA GT 130					.*NVIDIA.*GeForce.*GT.*13.*			2		1
+NVIDIA GT 140M					.*NVIDIA.*GeForce.*GT.*140M.*		2		1
+NVIDIA GT 140					.*NVIDIA.*GeForce.*GT.*14.*			2		1
+NVIDIA GT 150M					.*NVIDIA.*GeForce.*GT.*150M.*		2		1
+NVIDIA GT 150					.*NVIDIA.*GeForce.*GT.*15.*			2		1
+NVIDIA GT 160M					.*NVIDIA.*GeForce.*GT.*160M.*		2		1
+NVIDIA GT 220M					.*NVIDIA.*GeForce.*GT.*220M.*		2		1
+NVIDIA GT 220					.*NVIDIA.*GeForce.*GT.*22.*			2		1
+NVIDIA GT 230M					.*NVIDIA.*GeForce.*GT.*230M.*		2		1
+NVIDIA GT 230					.*NVIDIA.*GeForce.*GT.*23.*			2		1
+NVIDIA GT 240M					.*NVIDIA.*GeForce.*GT.*240M.*		2		1
+NVIDIA GT 240					.*NVIDIA.*GeForce.*GT.*24.*			2		1
+NVIDIA GT 250M					.*NVIDIA.*GeForce.*GT.*250M.*		2		1
+NVIDIA GT 260M					.*NVIDIA.*GeForce.*GT.*260M.*		2		1
+NVIDIA GT 320M					.*NVIDIA.*GeForce.*GT.*320M.*		0		1
+NVIDIA GT 320					.*NVIDIA.*GeForce.*GT.*32.*			0		1
+NVIDIA GT 325M					.*NVIDIA.*GeForce.*GT.*325M.*		0		1
+NVIDIA GT 330M					.*NVIDIA.*GeForce.*GT.*330M.*		1		1
+NVIDIA GT 330					.*NVIDIA.*GeForce.*GT.*33.*			1		1
+NVIDIA GT 335M					.*NVIDIA.*GeForce.*GT.*335M.*		1		1
+NVIDIA GT 340					.*NVIDIA.*GeForce.*GT.*34.*			1		1
+NVIDIA GT 415M					.*NVIDIA.*GeForce.*GT.*415M.*		2		1
+NVIDIA GT 420M					.*NVIDIA.*GeForce.*GT.*420M.*		2		1
+NVIDIA GT 420					.*NVIDIA.*GeForce.*GT.*42.*			2		1
+NVIDIA GT 425M					.*NVIDIA.*GeForce.*GT.*425M.*		3		1
+NVIDIA GT 430					.*NVIDIA.*GeForce.*GT.*43.*			3		1
+NVIDIA GT 435M					.*NVIDIA.*GeForce.*GT.*435M.*		3		1
+NVIDIA GT 440					.*NVIDIA.*GeForce.*GT.*44.*			3		1
+NVIDIA GT 445M					.*NVIDIA.*GeForce.*GT.*445M.*		3		1
+NVIDIA GT 450					.*NVIDIA.*GeForce.*GT.*45.*			3		1
+NVIDIA GT 520					.*NVIDIA.*GeForce.*GT.*52.*			2		1
+NVIDIA GT 540M					.*NVIDIA.*GeForce.*GT.*540M.*		3		1
+NVIDIA GT 540					.*NVIDIA.*GeForce.*GT.*54.*			3		1
+NVIDIA GTS 240					.*NVIDIA.*GeForce *GTS.*24.*		3		1
+NVIDIA GTS 250					.*NVIDIA.*GeForce.*GTS.*25.*		3		1
+NVIDIA GTS 260M					.*NVIDIA.*GeForce.*GTS.*260M.*		3		1
+NVIDIA GTS 280M					.*NVIDIA.*GeForce.*GTS.*280M.*		3		1
+NVIDIA GTS 285M					.*NVIDIA.*GeForce.*GTS.*285M.*		3		1
+NVIDIA GTS 350M					.*NVIDIA.*GeForce.*GTS.*350M.*		3		1
+NVIDIA GTS 360M					.*NVIDIA.*GeForce.*GTS.*360M.*		3		1
+NVIDIA GTS 450					.*NVIDIA.*GeForce.*GTS.*45.*		3		1
+NVIDIA GTX 260					.*NVIDIA.*GeForce.*GTX.*26.*		3		1
+NVIDIA GTX 270					.*NVIDIA.*GeForce.*GTX.*27.*		3		1
+NVIDIA GTX 275					.*NVIDIA.*GeForce.*GTX.*27.*		3		1
+NVIDIA GTX 280					.*NVIDIA.*GeForce.*GTX.*28.*		3		1
+NVIDIA GTX 285					.*NVIDIA.*GeForce.*GTX.*28.*		3		1
+NVIDIA GTX 290					.*NVIDIA.*GeForce.*GTX.*29.*		3		1
+NVIDIA GTX 295					.*NVIDIA.*GeForce.*GTX.*29.*		3		1
+NVIDIA GTX 460M					.*NVIDIA.*GeForce.*GTX.*460M.*		3		1
+NVIDIA GTX 460					.*NVIDIA.*GeForce.*GTX.*46.*		3		1
+NVIDIA GTX 465					.*NVIDIA.*GeForce.*GTX.*46.*		3		1
+NVIDIA GTX 470M					.*NVIDIA.*GeForce.*GTX.*470M.*		3		1
+NVIDIA GTX 470					.*NVIDIA.*GeForce.*GTX.*47.*		3		1
+NVIDIA GTX 480M					.*NVIDIA.*GeForce.*GTX.*480M.*		3		1
+NVIDIA GTX 480					.*NVIDIA.*GeForce.*GTX.*48.*		3		1
+NVIDIA GTX 560					.*NVIDIA.*GeForce.*GTX.*56.*		3		1
+NVIDIA GTX 570					.*NVIDIA.*GeForce.*GTX.*57.*		3		1
+NVIDIA GTX 580M					.*NVIDIA.*GeForce.*GTX.*580M.*		3		1
+NVIDIA GTX 580					.*NVIDIA.*GeForce.*GTX.*58.*		3		1
 NVIDIA C51						.*NVIDIA.*C51.*						0		1
 NVIDIA G72						.*NVIDIA.*G72.*						1		1
 NVIDIA G73						.*NVIDIA.*G73.*						1		1
@@ -228,6 +292,7 @@ NVIDIA GeForce 2				.*GeForce2.*						0		1
 NVIDIA GeForce 3				.*GeForce3.*						0		1
 NVIDIA GeForce 4 Go				.*NVIDIA.*GeForce4.*Go.*			0		1
 NVIDIA GeForce 4 MX				.*NVIDIA.*GeForce4 MX.*				0		1
+NVIDIA GeForce 4 PCX			.*NVIDIA.*GeForce4 PCX.*			0		1
 NVIDIA GeForce 4 Ti				.*NVIDIA.*GeForce4 Ti.*				0		1
 NVIDIA GeForce 6100				.*NVIDIA.*GeForce 61.*				0		1
 NVIDIA GeForce 6200				.*NVIDIA.*GeForce 62.*				0		1
@@ -235,37 +300,45 @@ NVIDIA GeForce 6500				.*NVIDIA.*GeForce 65.*				0		1
 NVIDIA GeForce 6600				.*NVIDIA.*GeForce 66.*				1		1
 NVIDIA GeForce 6700				.*NVIDIA.*GeForce 67.*				2		1
 NVIDIA GeForce 6800				.*NVIDIA.*GeForce 68.*				2		1
-NVIDIA GeForce 7000				.*NVIDIA.*GeForce 70.*				0		1
-NVIDIA GeForce 7100				.*NVIDIA.*GeForce 71.*				0		1
+NVIDIA GeForce 7000M			.*NVIDIA.*GeForce 7000M.*			0		1
+NVIDIA GeForce 7100M			.*NVIDIA.*GeForce 7100M.*			0		1
 NVIDIA GeForce 7200				.*NVIDIA.*GeForce 72.*				1		1
 NVIDIA GeForce 7300				.*NVIDIA.*GeForce 73.*				1		1
 NVIDIA GeForce 7500				.*NVIDIA.*GeForce 75.*				1		1
 NVIDIA GeForce 7600				.*NVIDIA.*GeForce 76.*				2		1
-NVIDIA GeForce 7800				.*NVIDIA.*GeForce.78.*				2		1
-NVIDIA GeForce 7900				.*NVIDIA.*GeForce.79.*				2		1
+NVIDIA GeForce 7800				.*NVIDIA.*GeForce.*78.*				2		1
+NVIDIA GeForce 7900				.*NVIDIA.*GeForce.*79.*				2		1
 NVIDIA GeForce 8100				.*NVIDIA.*GeForce 81.*				1		1
+NVIDIA GeForce 8200M			.*NVIDIA.*GeForce 8200M.*				1		1
 NVIDIA GeForce 8200				.*NVIDIA.*GeForce 82.*				1		1
 NVIDIA GeForce 8300				.*NVIDIA.*GeForce 83.*				1		1
+NVIDIA GeForce 8400M			.*NVIDIA.*GeForce 8400M.*			1		1
 NVIDIA GeForce 8400				.*NVIDIA.*GeForce 84.*				1		1
 NVIDIA GeForce 8500				.*GeForce 85.*						3		1
 NVIDIA GeForce 8600M			.*NVIDIA.*GeForce.*8600M.*			1		1
 NVIDIA GeForce 8600				.*NVIDIA.*GeForce 86.*				3		1
+NVIDIA GeForce 8700M			.*NVIDIA.*GeForce 8700M.*			3		1
 NVIDIA GeForce 8700				.*NVIDIA.*GeForce 87.*				3		1
 NVIDIA GeForce 8800				.*NVIDIA.*GeForce 88.*				3		1
-NVIDIA GeForce 9100				.*NVIDIA.*GeForce 9100.*			0		1
-NVIDIA GeForce 9200				.*NVIDIA.*GeForce 9200.*			0		1
+NVIDIA GeForce 8800M			.*NVIDIA.*GeForce 8800M.*			3		1
+NVIDIA GeForce 9100M			.*NVIDIA.*GeForce 9100M.*			0		1
+NVIDIA GeForce 9100				.*NVIDIA.*GeForce 91.*				0		1
+NVIDIA GeForce 9200M			.*NVIDIA.*GeForce 9200M.*			1		1
+NVIDIA GeForce 9200				.*NVIDIA.*GeForce 92.*				1		1
 NVIDIA GeForce 9300M			.*NVIDIA.*GeForce 9300M.*			1		1
 NVIDIA GeForce 9300				.*NVIDIA.*GeForce 93.*				1		1
 NVIDIA GeForce 9400M			.*NVIDIA.*GeForce 9400M.*			1		1
-NVIDIA GeForce 9400				.*GeForce 94.*						1		1
-NVIDIA GeForce 9500M			.*NVIDIA.*GeForce 9500M.*			2		1
+NVIDIA GeForce 9400				.*NVIDIA.*GeForce 94.*				1		1
 NVIDIA GeForce 9500				.*NVIDIA.*GeForce 95.*				2		1
+NVIDIA GeForce 9500M			.*NVIDIA.*GeForce 9500M.*			2		1
+NVIDIA GeForce 9600				.*NVIDIA.*GeForce.*96.*				2		1
 NVIDIA GeForce 9600M			.*NVIDIA.*GeForce 9600M.*			2		1
-NVIDIA GeForce 9600				.*NVIDIA.*GeForce.*96.*				3		1
 NVIDIA GeForce 9700M			.*NVIDIA.*GeForce 9700M.*			2		1
+NVIDIA GeForce 9800M			.*NVIDIA.*GeForce 9800M.*			3		1
 NVIDIA GeForce 9800				.*NVIDIA.*GeForce.*98.*				3		1
 NVIDIA GeForce FX 5100			.*NVIDIA.*GeForce FX 51.*			0		1
 NVIDIA GeForce FX 5200			.*NVIDIA.*GeForce FX 52.*			0		1
+NVIDIA GeForce FX 5300			.*NVIDIA.*GeForce FX 53.*			0		1
 NVIDIA GeForce FX 5500			.*NVIDIA.*GeForce FX 55.*			0		1
 NVIDIA GeForce FX 5600			.*NVIDIA.*GeForce FX 56.*			0		1
 NVIDIA GeForce FX 5700			.*NVIDIA.*GeForce FX 57.*			1		1
@@ -281,6 +354,7 @@ NVIDIA GeForce FX Go5800		.*NVIDIA.*GeForce FX Go58.*			1		1
 NVIDIA GeForce FX Go5900		.*NVIDIA.*GeForce FX Go59.*			1		1
 NVIDIA GeForce Go 6100			.*NVIDIA.*GeForce Go 61.*			0		1
 NVIDIA GeForce Go 6200			.*NVIDIA.*GeForce Go 62.*			0		1
+NVIDIA GeForce Go 6400			.*NVIDIA.*GeForce Go 64.*			1		1
 NVIDIA GeForce Go 6500			.*NVIDIA.*GeForce Go 65.*			1		1
 NVIDIA GeForce Go 6600			.*NVIDIA.*GeForce Go 66.*			1		1
 NVIDIA GeForce Go 6700			.*NVIDIA.*GeForce Go 67.*			1		1
@@ -298,7 +372,8 @@ NVIDIA G84						.*G84.*								1		1
 NVIDIA G92						.*G92.*								3		1
 NVIDIA G94						.*G94.*								3		1
 NVIDIA GeForce Go 6				.*GeForce Go 6.*					1		1
-NVIDIA ION						.*NVIDIA ION.*						1		1
+NVIDIA ION						.*NVIDIA ION.*						2		1
+NVIDIA ION 2					.*NVIDIA ION 2.*					2		1
 NVIDIA NB9M						.*GeForce NB9M.*					1		1
 NVIDIA NB9P						.*GeForce NB9P.*					1		1
 NVIDIA GeForce PCX				.*GeForce PCX.*						0		1
@@ -327,3 +402,4 @@ XGI								XGI.*								0		0
 VIA								VIA.*								0		0
 Apple Generic					Apple.*Generic.*					0		0
 Apple Software Renderer			Apple.*Software Renderer.*			0		0
+Microsoft RemoteFX Graphics Device - WDDM		Microsoft.*RemoteFX.*	0		0
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 1c45b3dd1..b564a5375 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -13,7 +13,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 SetOverwrite on				; overwrite files
 SetCompress auto			; compress iff saves space
-SetCompressor /solid lzma	; compress whole installer as one block
+SetCompressor /solid /final lzma	; compress whole installer as one block
 SetDatablockOptimize off	; only saves us 0.1%, not worth it
 XPStyle on                  ; add an XP manifest to the installer
 RequestExecutionLevel admin	; on Vista we must be admin because we write to Program Files
@@ -63,18 +63,18 @@ LangString LanguageCode ${LANG_DUTCH}    "nl"
 LangString LanguageCode ${LANG_PORTUGUESEBR} "pt"
 LangString LanguageCode ${LANG_SIMPCHINESE}  "zh"
 
-Name ${INSTNAME}
+Name ${VIEWERNAME}
 
 SubCaption 0 $(LicenseSubTitleSetup)	; override "license agreement" text
 
-BrandingText " "						; bottom of window text
+BrandingText "Prepare to Implode!"						; bottom of window text
 Icon          %%SOURCE%%\installers\windows\install_icon_singularity.ico
 UninstallIcon %%SOURCE%%\installers\windows\install_icon_singularity.ico
-WindowIcon on							; show our icon in left corner
-BGGradient off							; no big background window
+WindowIcon off							; show our icon in left corner
+BGGradient 9090b0 000000 notext
 CRCCheck on								; make sure CRC is OK
 InstProgressFlags smooth colored		; new colored smooth look
-ShowInstDetails nevershow				; no details, no "show" button
+ShowInstDetails show				; no details, no "show" button
 SetOverwrite on							; stomp files by default
 AutoCloseWindow true					; after all files install, close window
 
@@ -729,7 +729,7 @@ Call CheckWindowsVersion		; warn if on Windows 98/ME
 Call CheckIfAdministrator		; Make sure the user can install/uninstall
 Call CheckIfAlreadyCurrent		; Make sure that we haven't already installed this version
 Call CloseSecondLife			; Make sure we're not running
-Call CheckNetworkConnection		; ping secondlife.com
+#Call CheckNetworkConnection		; ping secondlife.com
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Don't remove cache files during a regular install, removing the inventory cache on upgrades results in lots of damage to the servers.
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index c7f0936ef..84803a96f 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -7606,10 +7606,6 @@ void LLAgent::sendAgentSetAppearance()
 	body_size.mV[VY] = body_size.mV[VY] + gSavedSettings.getF32("AscentAvatarYModifier");
 	body_size.mV[VZ] = body_size.mV[VZ] + gSavedSettings.getF32("AscentAvatarZModifier");
 
-// [RLVa:KB] - Checked: 2010-10-11 (RLVa-1.2.0e) | Added: RLVa-1.2.0e
-	body_size.mV[VZ] += RlvSettings::getAvatarOffsetZ();
-// [/RLVa:KB]
-
 	msg->addVector3Fast(_PREHASH_Size, body_size);	
 
 	// To guard against out of order packets
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index eae3c8d70..aafb18200 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2375,6 +2375,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			position,
 			true);
 
+		std::string prepend_msg;
 		if (gAgent.isInGroup(session_id)&& gSavedSettings.getBOOL("OptionShowGroupNameInChatIM"))
 		{
 			prepend_msg = "[";
diff --git a/indra/newview/res/singularity_icon.ico b/indra/newview/res/singularity_icon.ico
old mode 100644
new mode 100755
index 9d928494f..65b6e4abf
Binary files a/indra/newview/res/singularity_icon.ico and b/indra/newview/res/singularity_icon.ico differ
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index ad8f01141..fa3024360 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -62,7 +62,7 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_LL_ICON             ICON                    "singularity_icon.ico"
-IDI_LCD_LL_ICON         ICON                    "icon1.ico"
+IDI_LCD_LL_ICON         ICON                    "singularity_icon.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 66f6bff33..281efcf0b 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-#include "floateravatarlist.h"
+#include "llfloateravatarlist.h"
 #include "llavatarnamecache.h"
 #include "llfloaterbeacons.h"
 #include "llfloaterchat.h"
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index a9d19374e..391420bba 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -387,7 +387,7 @@ class WindowsManifest(ViewerManifest):
         !define INSTFLAGS "%(flags)s"
         !define INSTNAME   "SingularityViewer"
         !define SHORTCUT   "Singularity Viewer"
-        !define URLNAME   "singularity"
+        !define URLNAME   "secondlife"
         !define INSTALL_ICON "install_icon_singularity.ico"
         !define UNINSTALL_ICON "install_icon_singularity.ico"
         Caption "Singularity Viewer ${VERSION}"
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 3b9b5e507..d56bda3f6 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -1070,11 +1070,11 @@ version 2.0
 	}
 }
 
-// DirPopularQuery viewer->sim
+// DEPRECATED: DirPopularQuery viewer->sim
 // Special query for the land for sale/auction panel.
 // reliable
 {
-	DirPopularQuery Low 51 NotTrusted Zerocoded
+	DirPopularQuery Low 51 NotTrusted Zerocoded Deprecated
 	{
 		AgentData			Single
 		{	AgentID			LLUUID	}
@@ -1087,11 +1087,11 @@ version 2.0
 	}
 }
 
-// DirPopularQueryBackend sim->dataserver
+// DEPRECATED: DirPopularQueryBackend sim->dataserver
 // Special query for the land for sale/auction panel.
 // reliable
 {
-	DirPopularQueryBackend Low 52 Trusted Zerocoded
+	DirPopularQueryBackend Low 52 Trusted Zerocoded Deprecated
 	{
 		AgentData			Single
 		{	AgentID			LLUUID	}
@@ -1105,11 +1105,11 @@ version 2.0
 	}
 }
 
-// DirPopularReply
+// DEPRECATED: DirPopularReply
 // dataserver -> simulator -> viewer
 // reliable
 {
-	DirPopularReply Low 53 Trusted Zerocoded
+	DirPopularReply Low 53 Trusted Zerocoded Deprecated
 	{
 		AgentData			Single
 		{	AgentID			LLUUID	}
@@ -1383,6 +1383,10 @@ version 2.0
 		{	AgentID			LLUUID	}
 		{	KickedFromEstateID	U32	}
 	}
+	{
+		AgentInfo	Single
+		{   AgentEffectiveMaturity U32  }
+	}
 }
 
 // DataHomeLocationReply data->sim
@@ -2720,7 +2724,7 @@ version 2.0
 // end viewer to simulator section
 
 {
-       ViewerStats Low 131 NotTrusted Zerocoded
+       ViewerStats Low 131 NotTrusted Zerocoded UDPDeprecated
        {
                AgentData                       Single
                {       AgentID                 LLUUID      }
@@ -4911,6 +4915,12 @@ version 2.0
 		{	ActualArea		S32		}
 		{	Final			BOOL	}  // true if buyer should be in tier
 	}
+    {
+       RegionData Single  // included so region name shows up in transaction logs
+       {   RegionID   LLUUID }
+       {   GridX      U32    }
+       {   GridY      U32    }
+    }
 }
 
 // sim ->dataserver
@@ -5277,6 +5287,15 @@ version 2.0
 		VisualParam				Variable
 		{	ParamValue			U8	}
 	}
+	{
+		AgentAccess				Variable
+		{	AgentLegacyAccess		U8	}
+		{	AgentMaxAccess			U8	}
+	}
+	{
+		AgentInfo				Variable
+		{	Flags					U32	}
+	}
 }
 
 // ChildAgentAlive
@@ -8953,5 +8972,7 @@ version 2.0
 		{	InvType			S8	}
 		{	Name			Variable	1	}
 		{	Description		Variable	1	}
+
 	}
 }
+