diff options
author | Richard Linden <none@none> | 2011-11-26 21:21:56 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2011-11-26 21:21:56 -0800 |
commit | 6293746b59a4368d6e95b8c4e0951cd217aeee2b (patch) | |
tree | 1e7ff05468ed9ed7bb8aef0fc293f495b8dcec9e /indra/newview/llfloaterwebcontent.h | |
parent | 5a31ac4aee6b41d1b948dc0aa4420cbd5e765ce3 (diff) | |
parent | 61570bf84fdf5edad1e34188111d551b262c67e8 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/llfloaterwebcontent.h')
-rw-r--r-- | indra/newview/llfloaterwebcontent.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index 6fc66d1ad8..9d90306a9c 100644 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -43,6 +43,7 @@ class LLFloaterWebContent : public LLInstanceTracker<LLFloaterWebContent, std::string> { public: + typedef LLInstanceTracker<LLFloaterWebContent, std::string> instance_tracker_t; LOG_CLASS(LLFloaterWebContent); struct _Params : public LLInitParam::Block<_Params> |