diff options
author | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-21 10:33:58 -0800 |
---|---|---|
committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-21 10:33:58 -0800 |
commit | e1b198a36b051051941c61d0a558766591ed4cfc (patch) | |
tree | 1809bf28779ab1f9b0cd05c97f94af3b7dfa5532 /indra/llui/llscrolllistctrl.h | |
parent | fdd5348f81d51363a1639de8b3cc4414fc0f4982 (diff) | |
parent | 9c97a200bebe310f91c9ab181fbe337eeab30aaa (diff) |
Merge from trunk
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; |