diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-06-16 13:35:57 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-06-16 13:35:57 -0400 |
commit | 823ae2ea98c7fd24053d7bc97fbc178b654190b4 (patch) | |
tree | 3dfaa957000842778183b48f9b048bb9077cad07 /indra/newview/llinventoryobserver.cpp | |
parent | 4ae0a0703b9cb8e3f44687e81e26555ef91d5559 (diff) |
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).
Diffstat (limited to 'indra/newview/llinventoryobserver.cpp')
-rw-r--r-- | indra/newview/llinventoryobserver.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
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); |