diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:44:23 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:44:23 -0500 |
commit | 3aa12e85f04f0608da5df05b2cbb01685ef62944 (patch) | |
tree | 02e78886d530c92e3eddf0f73f3eb7f8a5b641da /indra/llui/llscrolllistctrl.h | |
parent | bae83c7eac98229271a6baf4c961fe167c74a597 (diff) | |
parent | a702b34394e4b38b27338eb6d68d22b498984118 (diff) |
merge fix(es) for storm-378
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; |