From 78dbaf2ed16bb901ac7121a1f25ff40329af6c10 Mon Sep 17 00:00:00 2001
From: Latif Khalifa <latifer@streamgrid.net>
Date: Mon, 4 Feb 2013 00:47:19 +0100
Subject: [PATCH 1/5] Moved RLVa menu back to advanced by default

---
 indra/newview/app_settings/settings_rlv.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings_rlv.xml b/indra/newview/app_settings/settings_rlv.xml
index bb385a033..7dd83af41 100644
--- a/indra/newview/app_settings/settings_rlv.xml
+++ b/indra/newview/app_settings/settings_rlv.xml
@@ -209,7 +209,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>RLVaWearReplaceUnlocked</key>
     <map>

From 56b2c10312bff41296e03816dc759529d3209253 Mon Sep 17 00:00:00 2001
From: Latif Khalifa <latifer@streamgrid.net>
Date: Thu, 7 Feb 2013 18:17:15 +0100
Subject: [PATCH 2/5] Renamed deferred rendering switch from 'Lightning and
 Shadows' to 'Advanced Lighting Model' as per upstream

---
 .../skins/default/xui/en-us/panel_preferences_graphics1.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index bfe2e285e..939e27d86 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -52,7 +52,7 @@
     <check_box bottom_delta="-17" control_name="RenderLocalLights" height="16" label="Local Lights" name="LightingDetailRadio"/>
 	<check_box bottom_delta="-17" control_name="VertexShaderEnable" height="16" initial_value="true" label="Basic shaders" left_delta="0" name="BasicShaders" tool_tip="Disabling this option may prevent some graphics card drivers from crashing."/>
 	<check_box bottom_delta="-17" control_name="WindLightUseAtmosShaders" initial_value="true" label="Atmospheric shaders" left_delta="0" name="WindLightUseAtmosShaders"/>
-	<check_box bottom_delta="-17" control_name="RenderDeferred" initial_value="true" label="Lighting and Shadows" tool_tip="Deferred Shading" left_delta="0" name="RenderDeferred"/>
+	<check_box bottom_delta="-17" control_name="RenderDeferred" initial_value="true" label="Advanced Lighting Model" tool_tip="Deferred Shading" left_delta="0" name="RenderDeferred"/>
     <check_box bottom_delta="-17" control_name="RenderDeferredSSAO" height="16" initial_value="true" label="Ambient Occlusion" left_delta="0" name="UseSSAO"/>
 	<check_box bottom_delta="-17" control_name="RenderDepthOfField"	initial_value="true" label="Depth of Field" left_delta="0" name="RenderDepthOfField"/>
   <text bottom_delta="-17" height="12" left="15" name="TerrainScaleText">Terrain Scale:</text>

From 69c43947edb584e4ad72e82ff473f12e392782b7 Mon Sep 17 00:00:00 2001
From: Latif Khalifa <latifer@streamgrid.net>
Date: Tue, 12 Feb 2013 03:30:13 +0100
Subject: [PATCH 3/5] Don't include warnings of singleton access from
 initSingleton() to the end users (release build)

---
 indra/llcommon/llsingleton.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 6fac2c8a9..45aae60e8 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -226,7 +226,7 @@ void LLSingleton<DERIVED_TYPE>::createInstance(SingletonInstanceData& data)
 	
 	if (data.mInitState == INITIALIZING)
 	{
-		llwarns << "Tried to access singleton " << typeid(DERIVED_TYPE).name() << " from initSingleton(), using half-initialized object" << llendl;
+		lldebugs << "Tried to access singleton " << typeid(DERIVED_TYPE).name() << " from initSingleton(), using half-initialized object" << llendl;
 		return;
 	}
 

From bb527b6ed173f0585ae6bd3e38aa8333833583bc Mon Sep 17 00:00:00 2001
From: Latif Khalifa <latifer@streamgrid.net>
Date: Sat, 16 Feb 2013 01:03:43 +0100
Subject: [PATCH 4/5] Updated 64 bit Linux prebuilt of PCRE based on NickyP's
 work in Kokua. Hopefully fixes startup crash on some distros

---
 indra/newview/viewer_manifest.py | 1 +
 install.xml                      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index b563ff97d..46488413c 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -861,6 +861,7 @@ class Linux_x86_64Manifest(LinuxManifest):
             self.path("libexpat.so*")
             self.path("libglod.so")
             self.path("libhunspell-1.3.so*")
+            self.path("libpcre.so.3");
             self.path("libminizip.so.1.2.3", "libminizip.so");
             self.path("libssl.so*")
             self.path("libuuid.so*")
diff --git a/install.xml b/install.xml
index 9633411ec..97874a4b9 100644
--- a/install.xml
+++ b/install.xml
@@ -1082,9 +1082,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>be0a9c92b5ab7d6761574b61685d6300</string>
+            <string>272bd861a7ff9f77e6908064cf52e4cf</string>
             <key>url</key>
-            <uri>https://bitbucket.org/Siana/singularityviewer/downloads/pcre-7.6-linux-x86_64-20120715.tar.bz2</uri>
+            <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/pcre-7.6-linux64-20130216.tar.bz2</uri>
           </map>
         </map>
       </map>

From e83befcb6bbf59dcab75daf70cfd6447d351da36 Mon Sep 17 00:00:00 2001
From: Latif Khalifa <latifer@streamgrid.net>
Date: Sat, 16 Feb 2013 02:19:57 +0100
Subject: [PATCH 5/5] Updated 32 bit Linux prebuilt of PCRE based on NickyP's
 work in Kokua. Includes unicode support.

---
 install.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.xml b/install.xml
index 97874a4b9..aa89c1af5 100644
--- a/install.xml
+++ b/install.xml
@@ -1075,9 +1075,9 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>3372b361e916df8981cb3bd7393b0353</string>
+            <string>a561ed0ef937f3086ba3f84f2e59b1b2</string>
             <key>url</key>
-            <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/pcre-7.6-linux-20110504.tar.bz2</uri>
+            <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/pcre-7.6-linux-20130216.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>