From 4a3494552c4181a7dcad3f8fb81949f7c0975c74 Mon Sep 17 00:00:00 2001 From: Nicky Date: Sun, 2 Nov 2014 23:58:18 +0100 Subject: [PATCH] FIRE-14896; Don't crash if FS AO folder contains another folder with an empty name. --- indra/newview/aoengine.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/indra/newview/aoengine.cpp b/indra/newview/aoengine.cpp index 032916c6ca..c5262d53ea 100644 --- a/indra/newview/aoengine.cpp +++ b/indra/newview/aoengine.cpp @@ -1039,6 +1039,13 @@ void AOEngine::update() { LLViewerInventoryCategory* currentCategory=categories->at(index); const std::string& setFolderName=currentCategory->getName(); + + if( setFolderName.empty()) + { + LL_WARNS("AOEngine") << "Folder with emtpy name in AO folder" << LL_ENDL; + continue; + } + std::vector params; LLStringUtil::getTokens(setFolderName,params,":");