diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:19:49 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:19:49 -0400 |
commit | bf96c7f67e623b09f83b2300e7b82cb04dce1ee3 (patch) | |
tree | 3d3ff515c4055877d2f1158287ddaf9dd5107a13 /indra/newview/llappviewer.h | |
parent | 76a54429fef78bb36ef5d4189e78867a7002f058 (diff) | |
parent | 4924f0c99b021869967f4587df703084d2bdc8ed (diff) |
merge
Diffstat (limited to 'indra/newview/llappviewer.h')
-rw-r--r-- | indra/newview/llappviewer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 168aaf5d94..71a7868191 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -270,7 +270,7 @@ private: LLAllocator mAlloc; - std::map<apr_dso_handle_t*, boost::shared_ptr<LLAPRPool> > mPlugins; + std::set<struct apr_dso_handle_t*> mPlugins; LLFrameTimer mMemCheckTimer; |