diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-10-06 05:44:54 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-10-06 05:44:54 +0000 |
| commit | f9c73f089a5a213e965aa59d6128ba5dd381186e (patch) | |
| tree | e4747a476edbd219bd3744d59bb95c36f15f92c9 | |
| parent | a00e546d524f0726b214fec87eb43135de365015 (diff) | |
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.
| -rwxr-xr-x | indra/newview/llinventorymodel.cpp | 4 |
1 files 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); } |