diff options
author | skolb <none@none> | 2009-12-03 09:18:11 -0800 |
---|---|---|
committer | skolb <none@none> | 2009-12-03 09:18:11 -0800 |
commit | 7851819c88e8049c1c3d07d279d479c53d5de777 (patch) | |
tree | e8c81e110a71427b64e0b34f4351e7acf44465f3 /indra/newview/llfloatersearch.cpp | |
parent | 9b17e6710b713fa12f6db7d6f51d97e4052a0835 (diff) | |
parent | 57b68d9bfe25fc7b9efe41a9fa30935c156acb34 (diff) |
local merge
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 |