summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpathfindingconsole.h
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2012-05-02 11:32:11 -0400
committerprep <prep@lindenlab.com>2012-05-02 11:32:11 -0400
commit44387d5ff0ef3453204c137b4c3816a689b9f9ce (patch)
treea99fb9829719ea8e27cb6756c33f52acef4e1d8c /indra/newview/llfloaterpathfindingconsole.h
parent9eec646601d6ce903d41dc305364373dc0a18b74 (diff)
Fix for Path-494. Teleporting with a list of renderables that needed to be restored caused a crash because the vo's had already been removed prior to the restorePermanentObjects() call.
Diffstat (limited to 'indra/newview/llfloaterpathfindingconsole.h')
-rw-r--r--indra/newview/llfloaterpathfindingconsole.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h
index 4af81698ff..348deeed00 100644
--- a/indra/newview/llfloaterpathfindingconsole.h
+++ b/indra/newview/llfloaterpathfindingconsole.h
@@ -158,6 +158,7 @@ private:
void handleRetrieveNeighborChange(LLControlVariable *pControl, const LLSD &pNewValue);
void handleNavMeshColorChange(LLControlVariable *pControl, const LLSD &pNewValue);
void fillInColorsForNavMeshVisualization();
+ void cleanupRenderableRestoreItems();
LLRootHandle<LLFloaterPathfindingConsole> mSelfHandle;
LLTextBase *mShowLabel;
@@ -222,7 +223,7 @@ private:
EConsoleState mConsoleState;
- std::vector<U32> mRenderableRestoreList;
+ std::vector<U32> mRenderableRestoreList;
static LLHandle<LLFloaterPathfindingConsole> sInstanceHandle;
};