diff options
author | Lynx Linden <lynx@lindenlab.com> | 2009-12-02 21:19:45 +0000 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2009-12-02 21:19:45 +0000 |
commit | 669c069d5cf717b6b98e470a4d269f9ac9669f4c (patch) | |
tree | b58dbac4627da4aca236043eb0140c5893120b0d /indra/newview/llfloatersearch.cpp | |
parent | 7bb862c8c1aa56fea6e533d5a257b3d39b428cac (diff) | |
parent | d491050c553ad2fa20f1ecadc37077fba3962b10 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llfloatersearch.cpp')
-rw-r--r-- | indra/newview/llfloatersearch.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index c8ff36b4f4..4d3724a758 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -41,6 +41,7 @@ LLFloaterSearch::LLFloaterSearch(const LLSD& key) : LLFloater(key), + LLViewerMediaObserver(), mBrowser(NULL) { // declare a map that transforms a category name into |