diff options
author | Richard Linden <none@none> | 2011-11-29 23:54:00 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2011-11-29 23:54:00 -0800 |
commit | 0323a37ac6c55e3ed599f60f4950c49e0e084c4a (patch) | |
tree | 5375e3679b21e8e7893bb5b8761ba681f981c68e /indra/newview/llfloaterwebcontent.h | |
parent | f2f90b6ed8e493a42aff805135527d6a7a345e3e (diff) | |
parent | ff32ef773b19a6d0f7826c7edf7962e2fde492e6 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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> |