diff options
| author | Richard Linden <none@none> | 2013-10-01 13:47:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-01 13:47:15 -0700 |
| commit | 9e486f6c6abbee6cb41ba9a6271d8a025ad924ef (patch) | |
| tree | e6a8d1de4fc9fa4e8eff575d4ab430f7a72a4170 /indra/llui/llviewmodel.cpp | |
| parent | 1aa9ad575488eb1f808f3bfcb5f0ffa1e8e95591 (diff) | |
| parent | 12f0f8cb72f789e21b01b45063dcc5f1f5292087 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llui/llviewmodel.cpp')
| -rwxr-xr-x | indra/llui/llviewmodel.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/llui/llviewmodel.cpp b/indra/llui/llviewmodel.cpp index 6459ade027..282addf692 100755 --- a/indra/llui/llviewmodel.cpp +++ b/indra/llui/llviewmodel.cpp @@ -37,13 +37,15 @@ /// LLViewModel::LLViewModel() - : mDirty(false) +: LLTrace::MemTrackable<LLViewModel>("LLViewModel"), + mDirty(false) { } /// Instantiate an LLViewModel with an existing data value LLViewModel::LLViewModel(const LLSD& value) - : mDirty(false) +: LLTrace::MemTrackable<LLViewModel>("LLViewModel"), + mDirty(false) { setValue(value); } @@ -79,12 +81,14 @@ LLTextViewModel::LLTextViewModel(const LLSD& value) /// Update the stored value void LLTextViewModel::setValue(const LLSD& value) { - LLViewModel::setValue(value); // approximate LLSD storage usage disclaimMem(mDisplay.size()); + LLViewModel::setValue(value); disclaimMem(mDisplay); mDisplay = utf8str_to_wstring(value.asString()); + claimMem(mDisplay); + // approximate LLSD storage usage claimMem(mDisplay.size()); // mDisplay and mValue agree |