diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-14 16:38:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-14 16:38:12 -0400 |
| commit | d6fdc6e68fc713b21b68e42740d63c3e9005bceb (patch) | |
| tree | 8692c2c7ac5e3b0bbb5fa2b5362f2796dcf71e8b /indra/llui/llkeywords.cpp | |
| parent | bc7a579ba285fa64876a2bc116685f0357fe25dc (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
merge changes for 3.7.3-release
Diffstat (limited to 'indra/llui/llkeywords.cpp')
| -rwxr-xr-x | indra/llui/llkeywords.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index b4932489b5..82b50f43ab 100755 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -75,8 +75,11 @@ LLKeywords::LLKeywords() : LLKeywords::~LLKeywords() { std::for_each(mWordTokenMap.begin(), mWordTokenMap.end(), DeletePairedPointer()); + mWordTokenMap.clear(); std::for_each(mLineTokenList.begin(), mLineTokenList.end(), DeletePointer()); + mLineTokenList.clear(); std::for_each(mDelimiterTokenList.begin(), mDelimiterTokenList.end(), DeletePointer()); + mDelimiterTokenList.clear(); } void LLKeywords::addColorGroup(const std::string key_in, const LLColor4 color) |