From 31f738583e770856a571653a9e23c096ce4049db Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 1 Dec 2010 13:35:30 -0500 Subject: Forgot to give myself credit --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index d4e459039d..43ab6ecd60 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -356,6 +356,7 @@ Joghert LeSabre Jonathan Yap VWR-17801 STORM-616 + STORM-615 Kage Pixel VWR-11 Ken March -- cgit v1.3 From 71a1fd09e3344920fef56cd0fbeac9710f2b698c Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 3 Dec 2010 10:15:33 -0500 Subject: Add ability to see Details button in Object Profile for 1-prim objects --- doc/contributions.txt | 5 +++-- indra/newview/llsidepaneltaskinfo.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 2334aeb17b..8cb3fd9f35 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -354,10 +354,11 @@ JB Kraft Joghert LeSabre VWR-64 Jonathan Yap - VWR-17801 + STORM-596 STORM-616 STORM-679 - STORM-596 + STORM-723 + VWR-17801 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp index 47d904dfcc..ff472c2141 100644 --- a/indra/newview/llsidepaneltaskinfo.cpp +++ b/indra/newview/llsidepaneltaskinfo.cpp @@ -1125,8 +1125,8 @@ void LLSidepanelTaskInfo::updateVerbs() mOpenBtn->setVisible(!multi_select); mPayBtn->setVisible(!multi_select); mBuyBtn->setVisible(!multi_select); - mDetailsBtn->setVisible(multi_select); - mDetailsBtn->setEnabled(multi_select); + mDetailsBtn->setVisible(TRUE); + mDetailsBtn->setEnabled(TRUE); mOpenBtn->setEnabled(enable_object_open()); mPayBtn->setEnabled(enable_pay_object()); -- cgit v1.3 From 8cfea0bab14afc29887de4b61350e6268b793622 Mon Sep 17 00:00:00 2001 From: Coaldust Numbers 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