From c0a79227d71fbfdd2bfa6402f92d35d0c23d7f92 Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Tue, 29 May 2012 16:52:57 -0700
Subject: Add individual volume controls to pannel_volume_pulldown Also
 includes translations for some of the other languages

---
 doc/contributions.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 04edfb4bea..df0aab4a89 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1092,8 +1092,9 @@ Synystyr Texan
 Takeda Terrawyng
 TankMaster Finesmith
 	STORM-1100
-	STORM-1602
 	STORM-1258
+	STORM-1602
+	STORM-1868
     VWR-26622
 Talamasca
 Tali Rosca
-- 
cgit v1.3


From a64bb32b0550afdf9cd54c4f3f38225a1fcc0b90 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 8 Jun 2012 18:05:31 -0400
Subject: STORM-1877 Missing entries in strings.xml for some Inventory folder
 names

---
 doc/contributions.txt                          | 1 +
 indra/newview/skins/default/xui/en/strings.xml | 4 ++++
 2 files changed, 5 insertions(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 04edfb4bea..ee6bb279c0 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -629,6 +629,7 @@ Jonathan Yap
 	STORM-1809
 	STORM-1793
 	STORM-1810
+	STORM-1877
 Kadah Coba
 	STORM-1060
 Jondan Lundquist
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4ccec4838a..f565928d44 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2139,11 +2139,15 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
   <!-- historically default name of the Favorites folder can start from either "f" or "F" letter.
   We should localize both of them with the same value -->
 	<string name="InvFolder favorite">My Favorites</string>
+	<string name="InvFolder Favorites">My Favorites</string>
+	<string name="InvFolder favorites">My Favorites</string>
 	<string name="InvFolder Current Outfit">Current Outfit</string>
 	<string name="InvFolder Initial Outfits">Initial Outfits</string>
 	<string name="InvFolder My Outfits">My Outfits</string>
 	<string name="InvFolder Accessories">Accessories</string>
 	<string name="InvFolder Meshes">Meshes</string>
+	<string name="InvFolder Received Items">Received Items</string>
+	<string name="InvFolder Merchant Outbox">Merchant Outbox</string>
 
   <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
 	<string name="InvFolder Friends">Friends</string>
-- 
cgit v1.3


From 76abab0618861a6c97c60e6184af5506891f2e9d Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Mon, 11 Jun 2012 13:19:15 -0700
Subject: When using OS autobuild config switches, set build configuration in
 VS to specified type (release, relwithdebinfo, or debug)  Also, set startup
 project to SecondLife-bin

---
 autobuild.xml         | 36 ++++++++++++++++++++++++++++++++++++
 doc/contributions.txt |  1 +
 2 files changed, 37 insertions(+)

(limited to 'doc')

diff --git a/autobuild.xml b/autobuild.xml
index 0e4b81324a..fb34117c0c 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2303,6 +2303,18 @@
               </map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>..\indra</string>
+                  <string>&amp;&amp;</string>
+                  <string>..\indra\tools\vstool\VSTool.exe</string>
+                  <string>--solution</string>
+                  <string>SecondLife.sln</string>
+                  <string>--config</string>
+                  <string>Debug</string>
+                  <string>--startup</string>
+                  <string>secondlife-bin</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
@@ -2379,6 +2391,18 @@
               </map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>..\indra</string>
+                  <string>&amp;&amp;</string>
+                  <string>..\indra\tools\vstool\VSTool.exe</string>
+                  <string>--solution</string>
+                  <string>SecondLife.sln</string>
+                  <string>--config</string>
+                  <string>RelWithDebInfo</string>
+                  <string>--startup</string>
+                  <string>secondlife-bin</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
@@ -2455,6 +2479,18 @@
               </map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>..\indra</string>
+                  <string>&amp;&amp;</string>
+                  <string>..\indra\tools\vstool\VSTool.exe</string>
+                  <string>--solution</string>
+                  <string>SecondLife.sln</string>
+                  <string>--config</string>
+                  <string>Release</string>
+                  <string>--startup</string>
+                  <string>secondlife-bin</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 04edfb4bea..46b451291c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1091,6 +1091,7 @@ Sudane Erato
 Synystyr Texan
 Takeda Terrawyng
 TankMaster Finesmith
+	OPEN-140
 	STORM-1100
 	STORM-1602
 	STORM-1258
-- 
cgit v1.3


From 361a413d25509e0055b5f0dbaae7a5a50264a84f Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Tue, 12 Jun 2012 09:06:12 -0700
Subject: Add myself to contributions.txt

---
 doc/contributions.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 04edfb4bea..dffb41fb78 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1091,6 +1091,7 @@ Sudane Erato
 Synystyr Texan
 Takeda Terrawyng
 TankMaster Finesmith
+	OPEN-142
 	STORM-1100
 	STORM-1602
 	STORM-1258
-- 
cgit v1.3


From 9b2daf4b19fca22bd74aefab49ef41eb8e06c651 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 18 Jun 2012 12:48:57 -0400
Subject: add credit in contributions.txt

---
 doc/contributions.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index c5db396c97..f803e3da06 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -612,6 +612,7 @@ Jonathan Yap
 	STORM-1796
 Kadah Coba
 	STORM-1060
+    STORM-1843
 Jondan Lundquist
 Josef Munster
 Josette Windlow
-- 
cgit v1.3


From bbf8137ce5b9e53ca8be2aea5c553bff8699b4a7 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 18 Jun 2012 13:59:22 -0400
Subject: credit for STORM-1844

---
 doc/contributions.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index a34380df04..20b0bff07e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -727,6 +727,8 @@ Marc2 Sands
 Marianne McCann
 Marine Kelley
     STORM-281
+MartinRJ Fayray
+    STORM-1844
 Matthew Anthony
 Matthew Dowd
 	VWR-1344
-- 
cgit v1.3


From b4e1d03584ce0ee740887def2f7204dc3c5733c4 Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Tue, 26 Jun 2012 15:37:31 +0100
Subject: STORM-1895 - Rename Delay Restart button to Cancel Restart

---
 doc/contributions.txt                                     | 2 ++
 indra/newview/skins/default/xui/en/panel_region_debug.xml | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 18df538d2a..f0b9a4eecc 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1211,6 +1211,8 @@ Watty Berkson
 Westley Schridde
 Westley Streeter
 Whimsy Winx
+Whirly Fizzle
+	STORM-1895
 Whoops Babii
 	VWR-631
 	VWR-1640
diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
index 4550603134..81b2281adb 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -194,11 +194,11 @@
     <button
      follows="left|top"
      height="20"
-     label="Delay Restart"
+     label="Cancel Restart"
      layout="topleft"
      left_pad="155"
      name="cancel_restart_btn"
-     tool_tip="Delay region restart by one hour"
+     tool_tip="Cancel region restart"
      top_delta="0"
      width="150" />
 </panel>
-- 
cgit v1.3


From 78854c9baa4528943a0b399bca38b7f6dd446000 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Wed, 25 Jul 2012 16:42:37 -0700
Subject: Fix to build with code signing option (patch from STORM-1900)

---
 doc/contributions.txt                     |  3 +++
 indra/cmake/Variables.cmake               |  3 +++
 indra/lib/python/indra/util/llmanifest.py |  7 ++++++-
 indra/newview/CMakeLists.txt              |  7 +++++++
 indra/newview/viewer_manifest.py          | 10 ++++++++++
 5 files changed, 29 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index df504e4a8a..7aa76e0003 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -400,6 +400,7 @@ Gaberoonie Zanzibar
 Ganymedes Costagravas
 Geenz Spad
 	STORM-1823
+	STORM-1900
 Gene Frostbite
 GeneJ Composer
 Geneko Nemeth
@@ -654,6 +655,8 @@ Kage Pixel
 	VWR-11
 Kagehi Kohn
 Kaimen Takahe
+Katharine Berry
+	STORM-1900
 Keklily Longfall
 Ken Lavender
 Ken March
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index e9837a7bf1..df9755c0ec 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -145,6 +145,9 @@ set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
 set(VIEWER_CHANNEL "LindenDeveloper" CACHE STRING "Viewer Channel Name")
 set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
 
+set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer")
+set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.")
+
 set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
 set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
 set(UNATTENDED OFF CACHE BOOL "Should be set to ON for building with VC Express editions.")
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py
index a4fb77357c..bfcb259709 100644
--- a/indra/lib/python/indra/util/llmanifest.py
+++ b/indra/lib/python/indra/util/llmanifest.py
@@ -167,7 +167,12 @@ ARGUMENTS=[
     dict(name='version',
          description="""This specifies the version of Second Life that is
         being packaged up.""",
-         default=get_default_version)
+         default=get_default_version),
+    dict(name='signature',
+         description="""This specifies an identity to sign the viewer with, if any.
+        If no value is supplied, the default signature will be used, if any. Currently
+        only used on Mac OS X.""",
+         default=None)
     ]
 
 def usage(srctree=""):
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 9783601696..3ce40187b0 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1900,6 +1900,12 @@ if (DARWIN)
     )
 
   add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit mac-updater mac-crash-logger)
+  
+  if (ENABLE_SIGNING)
+      set(SIGNING_SETTING "--signature=${SIGNING_IDENTITY}")
+  else (ENABLE_SIGNING)
+      set(SIGNING_SETTING "")
+  endif (ENABLE_SIGNING)
 
   if (PACKAGE)
       add_custom_target(package ALL DEPENDS ${VIEWER_BINARY_NAME})
@@ -1919,6 +1925,7 @@ if (DARWIN)
           --login_channel=${VIEWER_LOGIN_CHANNEL}
           --source=${CMAKE_CURRENT_SOURCE_DIR}
           --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
+          ${SIGNING_SETTING}
         DEPENDS
           ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
       )
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d1c952ac3b..587d708e86 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -816,6 +816,16 @@ class DarwinManifest(ViewerManifest):
             self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script))
 
     def package_finish(self):
+		# Sign the app if requested.
+        if 'signature' in self.args:
+            identity = self.args['signature']
+            if identity == '':
+                identity = 'Developer ID Application'
+            self.run_command('codesign --force --sign %(identity)r %(bundle)r' % {
+							'identity': identity,
+							'bundle': self.get_dst_prefix()
+			})
+		
         channel_standin = 'Second Life Viewer'  # hah, our default channel is not usable on its own
         if not self.default_channel():
             channel_standin = self.channel()
-- 
cgit v1.3


From 08f35b6a14f4643f8110e3940f061b1319a1bb32 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 26 Jul 2012 17:07:12 +0200
Subject: STORM-1899: Avatar hand poses randomly get stuck in spread position

---
 doc/contributions.txt              |  1 +
 indra/llcharacter/llhandmotion.cpp | 60 ++++++++++++++++++++++++++++++++++----
 2 files changed, 56 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index df504e4a8a..08214fe196 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -174,6 +174,7 @@ Ansariel Hiller
 	VWR-26150
 	STORM-1685
 	STORM-1713
+	STORM-1899
 Aralara Rajal
 Ardy Lay
 	STORM-859
diff --git a/indra/llcharacter/llhandmotion.cpp b/indra/llcharacter/llhandmotion.cpp
index 63937d8255..696dba0d95 100644
--- a/indra/llcharacter/llhandmotion.cpp
+++ b/indra/llcharacter/llhandmotion.cpp
@@ -132,18 +132,68 @@ BOOL LLHandMotion::onUpdate(F32 time, U8* joint_mask)
 	{
 		if (mNewPose != HAND_POSE_RELAXED && mNewPose != mCurrentPose)
 		{
-			mCharacter->setVisualParamWeight(gHandPoseNames[mNewPose], 0.f);
+			// Only set param weight for poses other than
+			// default (HAND_POSE_SPREAD); HAND_POSE_SPREAD
+			// is not an animatable morph!
+			if (mNewPose != HAND_POSE_SPREAD)
+			{
+				mCharacter->setVisualParamWeight(gHandPoseNames[mNewPose], 0.f);
+			}
+
+			// Reset morph weight for current pose back to its
+			// full extend or it might be stuck somewhere in the middle if a
+			// pose is requested and the old pose is requested again shortly
+			// after while still blending to the other pose!
+			if (mCurrentPose != HAND_POSE_SPREAD)
+			{
+				mCharacter->setVisualParamWeight(gHandPoseNames[mCurrentPose], 1.f);
+			}
+
+			// Update visual params now if we won't blend
+			if (mCurrentPose == HAND_POSE_RELAXED)
+			{
+				mCharacter->updateVisualParams();
+			}
 		}
 		mNewPose = HAND_POSE_RELAXED;
 	}
 	else
 	{
-		// this is a new morph we didn't know about before
-		if (*requestedHandPose != mNewPose && mNewPose != mCurrentPose && mNewPose != HAND_POSE_SPREAD)
+		// Sometimes we seem to get garbage here, with poses that are out of bounds.
+		// So check for a valid pose first.
+		if (*requestedHandPose >= 0 && *requestedHandPose < NUM_HAND_POSES)
+		{
+			// This is a new morph we didn't know about before:
+			// Reset morph weight for both current and new pose
+			// back their starting values while still blending.
+			if (*requestedHandPose != mNewPose && mNewPose != mCurrentPose)
+			{
+				if (mNewPose != HAND_POSE_SPREAD)
+				{
+					mCharacter->setVisualParamWeight(gHandPoseNames[mNewPose], 0.f);
+				}
+
+				// Reset morph weight for current pose back to its full extend
+				// or it might be stuck somewhere in the middle if a pose is
+				// requested and the old pose is requested again shortly after
+				// while still blending to the other pose!
+				if (mCurrentPose != HAND_POSE_SPREAD)
+				{
+					mCharacter->setVisualParamWeight(gHandPoseNames[mCurrentPose], 1.f);
+				}
+
+				// Update visual params now if we won't blend
+				if (mCurrentPose == *requestedHandPose)
+				{
+					mCharacter->updateVisualParams();
+				}
+			}
+			mNewPose = *requestedHandPose;
+		}
+		else
 		{
-			mCharacter->setVisualParamWeight(gHandPoseNames[mNewPose], 0.f);
+			llwarns << "Requested hand pose out of range. Ignoring requested pose." << llendl;
 		}
-		mNewPose = *requestedHandPose;
 	}
 
 	mCharacter->removeAnimationData("Hand Pose");
-- 
cgit v1.3


From af6e665d5c9c9a5ea480389c284839f3945bf786 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 7 Sep 2012 11:22:45 -0500
Subject: MAINT-1491 Fix for L&S never being enabled by default on XP/Linux/OS
 X

---
 doc/contributions.txt                |  3 +++
 indra/newview/featuretable_linux.txt | 12 ------------
 indra/newview/featuretable_mac.txt   | 12 ------------
 indra/newview/featuretable_xp.txt    | 18 +++---------------
 4 files changed, 6 insertions(+), 39 deletions(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index df504e4a8a..98c606c0be 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -883,6 +883,8 @@ Nicholaz Beresford
 	VWR-2682
 	VWR-2684
 Nick Rhodes
+Nicky Dasmijn
+	VWR-29228
 Nicky Perian
 	OPEN-1
 	STORM-1087
@@ -1112,6 +1114,7 @@ TankMaster Finesmith
 	STORM-1602
 	STORM-1258
     VWR-26622
+	VWR-29224
 Talamasca
 Tali Rosca
 Tayra Dagostino
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 378e9650cf..5699bd9c8a 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -95,9 +95,6 @@ RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderDeferred				1	0
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	0
 RenderFSAASamples			1	0
 
 //
@@ -126,9 +123,6 @@ RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderDeferred				1	0
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	0
 RenderFSAASamples			1	0
 
 //
@@ -156,9 +150,6 @@ RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderDeferred				1	0
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	0
 RenderFSAASamples			1	0
 
 //
@@ -186,9 +177,6 @@ RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	48
-RenderDeferred				1	0
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	0
 RenderFSAASamples			1	2
 
 //
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 0f12769b38..3a91f19c58 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -97,9 +97,6 @@ RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderDeferred				1	0
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	0
 RenderFSAASamples			1	0
 
 //
@@ -128,9 +125,6 @@ RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderDeferred				1	0
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	0
 RenderFSAASamples			1	0
 
 //
@@ -158,9 +152,6 @@ RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderDeferred				1	0
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	0
 RenderFSAASamples			1	0
 
 //
@@ -188,9 +179,6 @@ RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	48
-RenderDeferred				1	0
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	2
 RenderFSAASamples			1	2
 
 //
diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt
index 8c1dd80d07..ad16e2533b 100644
--- a/indra/newview/featuretable_xp.txt
+++ b/indra/newview/featuretable_xp.txt
@@ -63,9 +63,9 @@ Disregard96DefaultDrawDistance	1	1
 RenderTextureMemoryMultiple		1	1.0
 RenderCompressTextures		1	1
 RenderShaderLightingMaxLevel	1	3
-RenderDeferred				1	0
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	0
+RenderDeferred				1	1
+RenderDeferredSSAO			1	1
+RenderShadowDetail			1	2
 WatchdogDisabled				1	1
 RenderUseStreamVBO			1	1
 RenderFSAASamples			1	16
@@ -97,9 +97,6 @@ RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderDeferred				1	0
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	0
 RenderFSAASamples			1	0
 
 //
@@ -128,9 +125,6 @@ RenderVolumeLODFactor		1	0.5
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderDeferred				1	0
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	0
 RenderFSAASamples			1	0
 
 //
@@ -158,9 +152,6 @@ RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
-RenderDeferred				1	0
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	0
 RenderFSAASamples			1	0
 
 //
@@ -188,9 +179,6 @@ RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
 WLSkyDetail					1	48
-RenderDeferred				1	0
-RenderDeferredSSAO			1	0
-RenderShadowDetail			1	2
 RenderFSAASamples			1	2
 
 //
-- 
cgit v1.3


From 185169cbbecebe2a35dbd937d6fb4e0a30fa1832 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 15 Nov 2012 11:29:38 -0500
Subject: correct attribution for STORM-1868 (add Wolf Loonie)

---
 doc/contributions.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index cf9cc032ae..f18985adcd 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1271,6 +1271,8 @@ Whoops Babii
 Winter Ventura
 Wilton Lundquist
 	VWR-7682
+Wolf Loonie
+	STORM-1868
 WolfPup Lowenhar
 	OPEN-1
 	OPEN-37
-- 
cgit v1.3