diff options
| author | Richard Linden <none@none> | 2014-02-24 18:45:59 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-02-24 18:45:59 -0800 |
| commit | 80b4a4a1f54dccb814b5486423bf6492b3ae58a7 (patch) | |
| tree | f17c7a9b433e443b2f30251dd15b1bf50d4f803c /indra/newview/llfloaterwebcontent.h | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
| parent | ef591d280eb3c5bae7da20540ad4cbb30858d0aa (diff) | |
merge with release
Diffstat (limited to 'indra/newview/llfloaterwebcontent.h')
| -rwxr-xr-x | indra/newview/llfloaterwebcontent.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h index f22940cd07..ad56eec859 100755 --- a/indra/newview/llfloaterwebcontent.h +++ b/indra/newview/llfloaterwebcontent.h @@ -40,11 +40,11 @@ class LLIconCtrl; class LLFloaterWebContent : public LLFloater, public LLViewerMediaObserver, - public LLInstanceTracker<LLFloaterWebContent, std::string> + public LLInstanceTracker<LLFloaterWebContent, std::string, LLInstanceTrackerReplaceOnCollision> { public: - typedef LLInstanceTracker<LLFloaterWebContent, std::string> instance_tracker_t; + typedef LLInstanceTracker<LLFloaterWebContent, std::string, LLInstanceTrackerReplaceOnCollision> instance_tracker_t; LOG_CLASS(LLFloaterWebContent); struct _Params : public LLInitParam::Block<_Params> |