diff options
author | Baker Linden <baker@lindenlab.com> | 2014-02-14 13:56:36 -0800 |
---|---|---|
committer | Baker Linden <baker@lindenlab.com> | 2014-02-14 13:56:36 -0800 |
commit | d7b902d57503dddca59c3d7a772e4f6a454afa7b (patch) | |
tree | 57ee888de113b0e6009875283af7122315198f8e /indra/llui/llkeywords.cpp | |
parent | 49ade5a7197490bfb9a08a45009f52a3170e385d (diff) |
[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
- Added clear() after DeletePointer() call to hopfully fix this...
Diffstat (limited to 'indra/llui/llkeywords.cpp')
-rwxr-xr-x | indra/llui/llkeywords.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index 26d27d1f34..ddf33cf6e0 100755 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -77,7 +77,9 @@ LLKeywords::~LLKeywords() { std::for_each(mWordTokenMap.begin(), mWordTokenMap.end(), DeletePairedPointer()); std::for_each(mLineTokenList.begin(), mLineTokenList.end(), DeletePointer()); + mLineTokenList.clear(); std::for_each(mDelimiterTokenList.begin(), mDelimiterTokenList.end(), DeletePointer()); + mDelimiterTokenList.clear(); } BOOL LLKeywords::loadFromFile( const std::string& filename ) |