diff options
| author | James Cook <james@lindenlab.com> | 2009-11-30 14:42:34 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-30 14:42:34 -0800 |
| commit | d83f934ec87e594b7e88267bdd1be938a73f090d (patch) | |
| tree | 2fc1bc60f960e3139f3da799b7d93c9a08f8e7c6 /indra/newview/llbottomtray.cpp | |
| parent | 1ec8ca378814b7f493f5f6e55fb505b5c884a995 (diff) | |
| parent | 7d3b3cc474822db144b623980d08b7addc2f77ff (diff) | |
merge
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 4823932951..c44b0b5331 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -31,6 +31,8 @@ */ #include "llviewerprecompiledheaders.h" // must be first include + +#define LLBOTTOMTRAY_CPP #include "llbottomtray.h" #include "llagent.h" @@ -46,7 +48,7 @@ #include "llsyswellwindow.h" #include "llfloatercamera.h" -// Build time optimization, generate this once in .cpp file +// Build time optimization, generate extern template once in .cpp file template class LLBottomTray* LLSingleton<class LLBottomTray>::getInstance(); LLBottomTray::LLBottomTray(const LLSD&) |