diff options
| author | Richard Linden <none@none> | 2010-09-21 09:34:56 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-21 09:34:56 -0700 |
| commit | e07c373bd4aef00aaa30735f722ed1b681a5d060 (patch) | |
| tree | 9a6997cebf80289d275758c6c9c2007f3fbfad98 /indra/newview/llmediactrl.h | |
| parent | a20a98454de522eba4da17881b85a0f16bb3c116 (diff) | |
| parent | 71259fcccbfa834eab35eb3e98a7afc93786b32f (diff) | |
merge
Diffstat (limited to 'indra/newview/llmediactrl.h')
| -rw-r--r-- | indra/newview/llmediactrl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index f010e5f4c8..65dfbbff78 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -40,7 +40,8 @@ class LLUICtrlFactory; class LLMediaCtrl : public LLPanel, public LLViewerMediaObserver, - public LLViewerMediaEventEmitter + public LLViewerMediaEventEmitter, + public LLInstanceTracker<LLMediaCtrl, LLUUID> { LOG_CLASS(LLMediaCtrl); public: |