From 823ae2ea98c7fd24053d7bc97fbc178b654190b4 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 16 Jun 2010 13:35:57 -0400 Subject: EXT-7735 FIXED When receiving a folder, "Show" (or hotlink) doesn't do anything Fixed highlight and open item code to work for both categories and items (was previously only working for items). --- indra/newview/llinventoryobserver.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'indra/newview/llinventoryobserver.cpp') diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp index bd35259670..0ac8fbcb15 100644 --- a/indra/newview/llinventoryobserver.cpp +++ b/indra/newview/llinventoryobserver.cpp @@ -308,7 +308,16 @@ void LLInventoryFetchItemsObserver::startFetch() // assume it's agent inventory. owner_id = gAgent.getID(); } - + + // Ignore categories since they're not items. We + // could also just add this to mComplete but not sure what the + // side-effects would be, so ignoring to be safe. + LLViewerInventoryCategory* cat = gInventory.getCategory(*it); + if (cat) + { + continue; + } + // It's incomplete, so put it on the incomplete container, and // pack this on the message. mIncomplete.push_back(*it); -- cgit v1.2.3