From 1ca028cd7b2b4a169cdc776dfa4b38b2fcb76440 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 23 Dec 2010 17:12:37 -0500
Subject: STORM-812 Make bottom buttons in Object Profile identical for single
 and multi-prim objects

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

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 740c2f470c..058c0b061c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -354,11 +354,12 @@ JB Kraft
 Joghert LeSabre
 	VWR-64
 Jonathan Yap
-	VWR-17801
+	STORM-596
 	STORM-616
 	STORM-679
-	STORM-596
 	STORM-726
+	STORM-812
+	VWR-17801
 Kage Pixel
 	VWR-11
 Ken March
-- 
cgit v1.3


From 44e6327674bbe45d92e3411c24ff51b5c4318bbb Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Tue, 28 Dec 2010 19:14:33 -0500
Subject: STORM-825 : Reenable the LLMatrix3::orthogonalize test in
 llmath/tests/m3math_test.cpp     Removed the skipping of a working test as
 this was causeing a the test to fail     building and thus not actualy
 running all the tests.

---
 doc/contributions.txt              | 1 +
 indra/llmath/tests/m3math_test.cpp | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index f987cf4852..2e4fceeb7b 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -796,6 +796,7 @@ WolfPup Lowenhar
 	STORM-654
 	STORM-674
 	STORM-776
+	STORM-825
 	VWR-20741
 	VWR-20933
 Zai Lynch
diff --git a/indra/llmath/tests/m3math_test.cpp b/indra/llmath/tests/m3math_test.cpp
index 8abf61b740..e4d31996a3 100644
--- a/indra/llmath/tests/m3math_test.cpp
+++ b/indra/llmath/tests/m3math_test.cpp
@@ -280,7 +280,6 @@ namespace tut
 		llmat_obj.setRows(llvec1, llvec2, llvec3);
 		llmat_obj.orthogonalize();
 
-		skip("Grr, LLMatrix3::orthogonalize test is failing.  Has it ever worked?");
 		ensure("LLMatrix3::orthogonalize failed ",
 		       is_approx_equal(0.19611613f, llmat_obj.mMatrix[0][0]) &&
 		       is_approx_equal(0.78446454f, llmat_obj.mMatrix[0][1]) &&
-- 
cgit v1.3


From 8cfea0bab14afc29887de4b61350e6268b793622 Mon Sep 17 00:00:00 2001
From: Coaldust Numbers <none@none>
Date: Fri, 7 Jan 2011 15:08:42 -0500
Subject: VWR-1095 fix for problems with uploads following bulk upload failure
 de minimus contribution accepted without CA - Oz Linden

---
 doc/contributions.txt                     | 2 ++
 indra/newview/llassetuploadresponders.cpp | 1 +
 2 files changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 3b14ce5125..9266ae3c5b 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -219,6 +219,8 @@ Catherine Pfeffer
 Celierra Darling
 	VWR-1274
 	VWR-6975
+Coaldust Numbers
+    VWR-1095
 Cron Stardust
 	VWR-10579
 Cypren Christenson
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index f12bc16d4b..dd5bc74b2a 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -126,6 +126,7 @@ void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason)
 			break;
 	}
 	LLUploadDialog::modalUploadFinished();
+	LLFilePicker::instance().reset();  // unlock file picker when bulk upload fails
 }
 
 //virtual 
-- 
cgit v1.3