summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryobserver.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2016-05-06 17:31:36 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2016-05-06 17:31:36 +0300
commitb32d00308e4c3efee0c799f936155b58665ffc21 (patch)
tree81d2aefb0303d48944f470a6fb6886ff0d497969 /indra/newview/llinventoryobserver.cpp
parent76d1551e2ce53f8c26a8f5ced6c27c9a85e8a19f (diff)
parent94559950a2c670990db56bd74e65d26652421b8c (diff)
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llinventoryobserver.cpp')
-rwxr-xr-xindra/newview/llinventoryobserver.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 776bb1c601..ce8705b7ac 100755
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -284,6 +284,12 @@ void LLInventoryFetchItemsObserver::startFetch()
continue;
}
+ if ((*it).isNull())
+ {
+ LL_WARNS("Inventory") << "Skip fetching for a NULL uuid" << LL_ENDL;
+ continue;
+ }
+
// It's incomplete, so put it on the incomplete container, and
// pack this on the message.
mIncomplete.push_back(*it);