From a803507d67bc7ff3d7f137a85d86017a254ab0de Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Sun, 1 Jul 2012 22:15:03 +0200 Subject: [PATCH] Use correct way to check if we logged in yet or not. Without this fix, we trigger an assert, in debug mode, that was added to Singularity exactly to find out if we called functions like getExpandedFilename(LL_PATH_PER_SL_ACCOUNT ...) before logging in. Checking if THAT function returns empty() is clearly not safe, but very error prone. --- indra/newview/llviewertexturelist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 4be8df0e9..d685b951e 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -277,7 +277,7 @@ void LLViewerTextureList::shutdown() break; } - if (count > 0 && !gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "").empty()) + if (count > 0 && !gDirUtilp->getLindenUserDir(true).empty()) { std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, get_texture_list_name()); llofstream file;