From 18638cd47ce17bce3fb9dcbb4759468ed772d202 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 10 Jul 2012 00:55:26 +0200
Subject: [PATCH 1/5] Fix assertion on shutdown if haven't logged in

---
 indra/newview/llviewertexturelist.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 4be8df0e9..90806a724 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -277,7 +277,7 @@ void LLViewerTextureList::shutdown()
 			break;
 	}
 	
-	if (count > 0 && !gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "").empty())
+	if (count > 0 && !gDirUtilp->getLindenUserDir(true).empty())	
 	{
 		std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, get_texture_list_name());
 		llofstream file;

From b19c284eb77fbbc829eaa6d308ad54c4846235e3 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 10 Jul 2012 05:34:50 +0200
Subject: [PATCH 2/5] Make void water subdivision tunable

---
 indra/newview/app_settings/settings.xml | 13 +++++++++++++
 indra/newview/llvowater.cpp             |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2eca82c95..a4d94dd95 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -21,6 +21,19 @@
 	  <integer>1</integer>
 	</map>
 
+	<key>SianaVoidWaterSubdivision</key>
+	<map>
+	  <key>Comment</key>
+	  <string>Number of tiles of void water</string>
+	  <key>Persist</key>
+	  <integer>1</integer>
+	  <key>Type</key>
+	  <string>U32</string>
+	  <key>Value</key>
+	  <integer>8</integer>
+	</map>
+
+
   <key>SGAbsolutePointer</key>
   <map>
 	<key>Comment</key>
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp
index 9ba977f22..05e033392 100644
--- a/indra/newview/llvowater.cpp
+++ b/indra/newview/llvowater.cpp
@@ -170,7 +170,8 @@ BOOL LLVOWater::updateGeometry(LLDrawable *drawable)
 	static const unsigned int indices_per_quad = 6;
 
 	static const LLCachedControl<bool> render_transparent_water("RenderTransparentWater",false);
-	const S32 size = (render_transparent_water && LLGLSLShader::sNoFixedFunction) ? 16 : 1;
+	static const LLCachedControl<U32> water_subdiv("SianaVoidWaterSubdivision", 16);
+	const S32 size = (render_transparent_water && LLGLSLShader::sNoFixedFunction) ? water_subdiv : 1;
 	const S32 num_quads = size * size;
 	face->setSize(vertices_per_quad * num_quads,
 				  indices_per_quad * num_quads);

From 2f743fe2ce0a9ebf1f9c2ed96aa8d6abf6414580 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 10 Jul 2012 05:36:07 +0200
Subject: [PATCH 3/5] About floater fixup, new contributors!

---
 indra/newview/llfloaterabout.cpp              |  3 ++-
 .../skins/default/xui/en-us/floater_about.xml | 20 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 8516035d3..e9a6a367e 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -208,13 +208,14 @@ LLFloaterAbout::LLFloaterAbout()
 	support.append( gSysCPU.getCPUString() );
 	support.append("\n");
 
+	/* This is confusing and WRONG.
 	support.append("SSE Support:");
 	if(gSysCPU.hasSSE())
 		support.append(" SSE2\n");
 	else if(gSysCPU.hasSSE())
 		support.append(" SSE\n");
 	else
-		support.append(" None\n");
+		support.append(" None\n"); */
 
 	U32 memory = gSysMemory.getPhysicalMemoryKB() / 1024;
 	// Moved hack adjustment to Windows memory size into llsys.cpp
diff --git a/indra/newview/skins/default/xui/en-us/floater_about.xml b/indra/newview/skins/default/xui/en-us/floater_about.xml
index 2f32819c1..5b10b9afd 100644
--- a/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -3,15 +3,15 @@
  can_resize="false" height="440" min_height="100" min_width="100"
  name="floater_about" rect_control="FloaterAboutRect"
  title="About Singularity Viewer" width="470">
-  <tab_container follows="all" bottom="10" left="10" height="405" width="450" name="about_tab" tab_position="top">
-    <panel border="true" height="386" label="Info" help_topic="about_support_tab" name="support_panel">
-      <text_editor parse_urls="true" follows="top|left" font="SansSerif" height="343" bg_readonly_color="transparent" left="1" max_length="65536" name="support_editor" top="-1" bottom="28" width="446" word_wrap="true"/>
+  <tab_container follows="all" bottom="1" border="false" left="10" height="414" width="450" name="about_tab" tab_position="top">
+    <panel border="false" height="386" label="Info" help_topic="about_support_tab" name="support_panel">
+      <text_editor parse_urls="true" follows="top|left" font="SansSerif" top="-1" bg_readonly_color="transparent" left="3" max_length="65536" name="support_editor" bottom="28" width="443" word_wrap="true"/>
       <button follows="left|top" label="Copy to Clipboard" name="copy_btn" right="-5" bottom="0" top_pad="5" height="25" width="180"/>
     </panel>
 
-    <panel border="true" label="Credits" height="386" name="credits_panel">
-      <text_editor enabled="false" follows="left|top" bg_readonly_color="transparent" left="1" text_color="LtGray" max_length="65536" name="credits_editor" top="-1" bottom="0" width="446" word_wrap="true">
-Singularity Viewer is developed and maintained by Siana Gearz, Shyotl Kuhr, Aleric Inglewood and Narv Czervik, with contributions by Henri Beauchamp, Kitty Barnett, Thickbrick Sleaford, Zauber Parecelsus, Wolfspirit Magic and others. Singularity is based upon Ascent source code. Credits for Ascent include Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and others. Ascent is based upon the Inertia source code.
+    <panel border="false" label="Credits" height="386" name="credits_panel">
+      <text_editor enabled="false" follows="left|top" bg_readonly_color="transparent" left="3" max_length="65536" name="credits_editor" top="-1" bottom="0" width="443" word_wrap="true">
+Singularity Viewer is developed and maintained by Siana Gearz, Shyotl Kuhr, Aleric Inglewood, Narv Czervik, Tigh MacFanatic, Inusaito Kanya, Sovereign Engineer and Latif Khalifa, with contributions by Fractured Crystal, Fritigern Gothly, Henri Beauchamp, McCabe Maxsted, Kadah Coba, Kitty Barnett, Laika Tungsten, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Thickbrick Sleaford, Zauber Parecelsus, Wolfspirit Magic and others. Singularity is based upon Ascent source code. Credits for Ascent include Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and others. Ascent is based upon the Inertia source code.
 
 Singularity Viewer includes source code contributions of the following residents: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, 
 maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas
@@ -26,8 +26,8 @@ Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Low
       </text_editor>
     </panel>
 
-    <panel border="true" label="Licenses" height="386" name="licenses_panel">
-      <text_editor enabled="false" follows="left|top" bg_readonly_color="transparent" left="1" text_color="LtGray" max_length="65536" name="licenses_editor" top="-1" bottom="0" width="446" word_wrap="true"> 
+    <panel border="false" label="Licenses" height="386" name="licenses_panel">
+      <text_editor enabled="false" follows="left|top" bg_readonly_color="transparent" left="3" max_length="65536" name="licenses_editor" top="-1" bottom="0" width="443" word_wrap="true"> 
 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
 APR Copyright (C) 2000-2012 The Apache Software Foundation
 Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
@@ -54,10 +54,8 @@ This software contains source code provided by NVIDIA Corporation.
 All rights reserved.  See licenses.txt for details.
 
 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-To be a success in business, be daring, be first, be different. --Henry Marchant
       </text_editor>
-    </panel>
+    </panel-->
   </tab_container>  
   <string name="you_are_at">You are at [POSITION]</string>
 </floater>

From c71c7ca7cc1aadfb62edc33b0947f4939aa14212 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 10 Jul 2012 05:50:47 +0200
Subject: [PATCH 4/5] Make defaults less rude to others

---
 indra/newview/app_settings/settings.xml            |  2 +-
 indra/newview/app_settings/settings_ascent.xml     | 11 -----------
 indra/newview/app_settings/settings_ascent_coa.xml | 13 +++++++++++++
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a4d94dd95..99d586b59 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -772,7 +772,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>PrivateLookAt</key>
     <map>
diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml
index bcd1c2864..5a77d0f50 100644
--- a/indra/newview/app_settings/settings_ascent.xml
+++ b/indra/newview/app_settings/settings_ascent.xml
@@ -125,17 +125,6 @@
 			<key>Value</key>
 			<string>::</string>
 		</map>
-		<key>AscentHideTypingNotification</key>
-		<map>
-			<key>Comment</key>
-			<string>Keep those jerks guessing by hiding your "____ is typing..." message.</string>
-			<key>Persist</key>
-			<integer>1</integer>
-			<key>Type</key>
-			<string>Boolean</string>
-			<key>Value</key>
-			<integer>1</integer>
-		</map>
 		<key>AscentShowSelfTag</key>
 		<map>
 			<key>Comment</key>
diff --git a/indra/newview/app_settings/settings_ascent_coa.xml b/indra/newview/app_settings/settings_ascent_coa.xml
index ca4baa6d4..df5dc1d0a 100644
--- a/indra/newview/app_settings/settings_ascent_coa.xml
+++ b/indra/newview/app_settings/settings_ascent_coa.xml
@@ -44,7 +44,20 @@
 			<key>Type</key>
 			<string>Boolean</string>
 			<key>Value</key>
+			<integer>0</integer>
+			<key>IsCOA</key>
 			<integer>1</integer>
+		</map>
+		<key>AscentHideTypingNotification</key>
+		<map>
+			<key>Comment</key>
+			<string>Keep those jerks guessing by hiding your "____ is typing..." message.</string>
+			<key>Persist</key>
+			<integer>1</integer>
+			<key>Type</key>
+			<string>Boolean</string>
+			<key>Value</key>
+			<integer>0</integer>
 			<key>IsCOA</key>
 			<integer>1</integer>
 		</map>

From 515b1488c68ca0946073d281410f58a3a69ac23f Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 10 Jul 2012 06:14:07 +0200
Subject: [PATCH 5/5] Bumping the cache version

---
 indra/newview/lltexturecache.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index d8e477fa4..39c610ce0 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -873,7 +873,7 @@ BOOL LLTextureCache::isInLocal(const LLUUID& id)
 
 //static
 const S32 MAX_REASONABLE_FILE_SIZE = 512*1024*1024; // 512 MB
-F32 LLTextureCache::sHeaderCacheVersion = 1.5f;
+F32 LLTextureCache::sHeaderCacheVersion = 1.6f;
 U32 LLTextureCache::sCacheMaxEntries = MAX_REASONABLE_FILE_SIZE / TEXTURE_CACHE_ENTRY_SIZE;
 S64 LLTextureCache::sCacheMaxTexturesSize = 0; // no limit
 const char* entries_filename = "texture.entries";