summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xindra/llui/llfolderviewitem.cpp8
-rw-r--r--indra/newview/llinventorybridge.cpp6
2 files changed, 8 insertions, 6 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 42e5a6debf..6d3b883b09 100755
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -409,7 +409,7 @@ void LLFolderViewItem::selectItem(void)
BOOL LLFolderViewItem::isMovable()
{
return getViewModelItem()->isItemMovable();
- }
+}
BOOL LLFolderViewItem::isRemovable()
{
@@ -438,19 +438,19 @@ BOOL LLFolderViewItem::remove()
return FALSE;
}
return getViewModelItem()->removeItem();
- }
+}
// Build an appropriate context menu for the item.
void LLFolderViewItem::buildContextMenu(LLMenuGL& menu, U32 flags)
{
getViewModelItem()->buildContextMenu(menu, flags);
- }
+}
void LLFolderViewItem::openItem( void )
{
if (mAllowOpen)
{
- getViewModelItem()->openItem();
+ getViewModelItem()->openItem();
}
}
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index cb6290368c..837870ae27 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -511,8 +511,10 @@ BOOL LLInvFVBridge::isClipboardPasteable() const
// Each item must be copyable to be pastable
LLItemBridge item_br(mInventoryPanel.get(), mRoot, item_id);
if (!item_br.isItemCopyable())
- return FALSE;
- }
+ {
+ return FALSE;
+ }
+ }
return TRUE;
}