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 1d7b46e2c32c6bdf2e6cf5a8b9dcb0c8cb767b1b Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Mon, 17 Jan 2011 10:09:52 -0500 Subject: VWR-24217: allow Contents folder from object to be dragged to inventory --- doc/contributions.txt | 1 + indra/newview/llpanelobjectinventory.cpp | 20 +++++--------------- 2 files changed, 6 insertions(+), 15 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index f21354b406..839e92e086 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -393,6 +393,7 @@ Kitty Barnett STORM-288 STORM-799 STORM-800 + VWR-24217 Kunnis Basiat VWR-82 VWR-102 diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 211b9cf4b1..0b6267c9e6 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -766,22 +766,12 @@ BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); if(object) { - const LLInventoryItem *inv = dynamic_cast(object->getInventoryObject(mUUID)); - if (inv) + const LLInventoryObject* cat = object->getInventoryObject(mUUID); + if ( (cat) && (move_inv_category_world_to_agent(mUUID, LLUUID::null, FALSE)) ) { - const LLPermissions& perm = inv->getPermissions(); - bool can_copy = gAgent.allowOperation(PERM_COPY, perm, - GP_OBJECT_MANIPULATE); - if((can_copy && perm.allowTransferTo(gAgent.getID())) - || object->permYouOwner()) -// || gAgent.isGodlike()) - - { - *type = LLViewerAssetType::lookupDragAndDropType(inv->getType()); - - *id = inv->getUUID(); - return TRUE; - } + *type = LLViewerAssetType::lookupDragAndDropType(cat->getType()); + *id = mUUID; + return TRUE; } } } -- cgit v1.3