diff options
| author | Richard Linden <none@none> | 2013-03-06 11:27:12 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-03-06 11:27:12 -0800 |
| commit | 9a81945eac31f41848cd48a5ba18dee4949f2d03 (patch) | |
| tree | 2a0a6644adfa609651ce9c42a808ce67bef9d0b3 /indra/llui/llviewmodel.cpp | |
| parent | dcf4e489213d6e954a34fbb3c5c96e94645b868b (diff) | |
| parent | e52e5fe5be0d2f4e0e8ded445bd18c0985ef968a (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/llui/llviewmodel.cpp')
| -rw-r--r-- | indra/llui/llviewmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llviewmodel.cpp b/indra/llui/llviewmodel.cpp index 1bd09e8086..901260bec8 100644 --- a/indra/llui/llviewmodel.cpp +++ b/indra/llui/llviewmodel.cpp @@ -35,7 +35,7 @@ // external library headers // other Linden headers -LLTrace::MemStat LLViewModel::sMemStat("LLViewModel"); +LLTrace::MemStatHandle LLViewModel::sMemStat("LLViewModel"); /// LLViewModel::LLViewModel() |