From a25c405eaea29d8ae36a475f44b8b1fc2a63fb54 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Sat, 29 Dec 2012 18:08:46 +0100 Subject: [PATCH] Fix assert after failed login. reset_login(), among others, sets the state back to STATE_LOGIN_SHOW, which then causes gViewerWindow->initWorldUI() to be called, which is the (only) function that calls LLMenuOptionPathfindingRebakeNavmesh::initialize. In other words, it's perfectly normal to enter that function a second time and the assert is erroneous. --- indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp b/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp index dd5f1ea68..0dea26fb7 100644 --- a/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp +++ b/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp @@ -70,7 +70,6 @@ LLMenuOptionPathfindingRebakeNavmesh::~LLMenuOptionPathfindingRebakeNavmesh() void LLMenuOptionPathfindingRebakeNavmesh::initialize() { - llassert(!mIsInitialized); if (!mIsInitialized) { mIsInitialized = true;