diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-17 16:26:26 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-17 16:26:26 -0700 |
commit | 6c121d4540cb4f916dd5fc6e18078e6cc11478bf (patch) | |
tree | 062533e68cd8f201450c5383ae78c0cdc5cd7fd6 /indra/newview/llinventoryobserver.cpp | |
parent | a6774820bc455160c6e7be70506aac205ca7eac2 (diff) | |
parent | b022a9f15897cd3eb20f2c977e7c8e8f2660d27a (diff) |
Merge
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); |