diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 14f17e8917..a06cb838cf 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -1652,6 +1652,13 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv( return ACCEPT_NO; } + const LLUUID &outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false); + if(gInventory.isObjectDescendentOf(item->getUUID(), outbox_id)) + { + return ACCEPT_NO; + } + + if( drop ) { if(mSource == SOURCE_LIBRARY) diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 613e662e1a..1d0fb58a73 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -171,7 +171,7 @@ class="panel_marketplace_outbox" top="0" label="" - height="200" + height="35" width="330"> <string name="OutboxLabelWithArg">Merchant Outbox ([NUM])</string> <string name="OutboxLabelNoArg">Merchant Outbox</string> @@ -250,7 +250,7 @@ top="0" left="0" width="308" - height="165" + height="0" wrap="true" halign="center"> Set up your merchant account to use this feature. |