diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-06-23 17:50:52 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-06-23 17:50:52 -0700 |
| commit | 71b6d9d842e03a4a1eece88ec20a50b041b6137f (patch) | |
| tree | f44594dd4419f1d287698bb1cb5af73d7b868046 /indra/newview | |
| parent | e74f9fcc147edd24576a25bb6a0af69ac8d6a600 (diff) | |
fixing non-dnd portion of EXT-895
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llpanelmarketplaceinbox.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 728642e4c7..f23ae8c8ff 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -1,4 +1,4 @@ -/** +n/** * @file llsidepanelmaininventory.cpp * @brief Implementation of llsidepanelmaininventory. * @@ -592,6 +592,8 @@ void LLPanelMainInventory::onFocusReceived() { outbox_panel->clearSelection(); } +
+ sidepanel_inventory->updateVerbs(); } void LLPanelMainInventory::setFilterTextFromFilter() diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp index 1f3fbb40b4..2b04987084 100644 --- a/indra/newview/llpanelmarketplaceinbox.cpp +++ b/indra/newview/llpanelmarketplaceinbox.cpp @@ -69,7 +69,7 @@ BOOL LLPanelMarketplaceInbox::postBuild() mInventoryPanel->setSelectCallback(boost::bind(&LLPanelMarketplaceInbox::onSelectionChange, this));
// Set up the note to display when the inbox is empty
- mInventoryPanel->getFilter()->setEmptyLookupMessage("InboxNoItems");
+ //mInventoryPanel->getFilter()->setEmptyLookupMessage("InboxNoItems");
return TRUE;
}
@@ -108,6 +108,8 @@ void LLPanelMarketplaceInbox::onFocusReceived() outbox_panel->clearSelection();
}
}
+
+ sidepanel_inventory->updateVerbs();
}
BOOL LLPanelMarketplaceInbox::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg)
|