diff options
author | Richard Linden <none@none> | 2010-12-08 16:04:07 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2010-12-08 16:04:07 -0800 |
commit | ca2141ce90d484284bf57d72feb82e290958b061 (patch) | |
tree | 0e2ea77f0b7c2a9c9f9e69c09c0be22567afac3b /indra/llui/llscrolllistctrl.h | |
parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) | |
parent | c28b476a6806a426593e6798ea537f13ca354fc8 (diff) |
merge with viewer-dev
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; |