From f9c73f089a5a213e965aa59d6128ba5dd381186e Mon Sep 17 00:00:00 2001 From: Monty Brandenberg Date: Mon, 6 Oct 2014 05:44:54 +0000 Subject: BUG-7454 Viewer crashes while logging with a turned off "HTTP Inventory" The HttpRequest objects used in inventory ops are created lazily when needed. The update() operation didn't protect against their not being created. Added some guard tests around the update() operations and we're good. --- indra/newview/llinventorymodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index dab3a4c06d..f92332dea5 100755 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -2436,11 +2436,11 @@ void LLInventoryModel::initHttpRequest() void LLInventoryModel::handleResponses(bool foreground) { - if (foreground) + if (foreground && mHttpRequestFG) { mHttpRequestFG->update(0); } - else + else if (! foreground && mHttpRequestBG) { mHttpRequestBG->update(50000L); } -- cgit v1.2.3