diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-09 16:48:07 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-09 16:48:07 -0800 |
| commit | 95445fb1b56a60145933db0891133230c87274b8 (patch) | |
| tree | f9b03971e89800c68b4c4430b13c90af6cba51e7 /indra/llui/llscrolllistctrl.h | |
| parent | 089665ce4eab97d0ab58e08914f852219ed3fae7 (diff) | |
| parent | cf6147f7c092e6ca10697dea341099c5e281df00 (diff) | |
Merge with viewer-development.
Diffstat (limited to 'indra/llui/llscrolllistctrl.h')
| -rw-r--r-- | indra/llui/llscrolllistctrl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h index 8a2f893ba2..09ab89960d 100644 --- a/indra/llui/llscrolllistctrl.h +++ b/indra/llui/llscrolllistctrl.h @@ -491,7 +491,7 @@ private: mutable bool mSorted; - typedef std::map<std::string, LLScrollListColumn> column_map_t; + typedef std::map<std::string, LLScrollListColumn*> column_map_t; column_map_t mColumns; BOOL mDirty; |