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.h | |
| parent | 1ec8ca378814b7f493f5f6e55fb505b5c884a995 (diff) | |
| parent | 7d3b3cc474822db144b623980d08b7addc2f77ff (diff) | |
merge
Diffstat (limited to 'indra/newview/llbottomtray.h')
| -rw-r--r-- | indra/newview/llbottomtray.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index 30f5f88cce..728a420324 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -47,8 +47,10 @@ class LLSpeakButton; class LLNearbyChatBar; class LLIMChiclet; -// Build time optimization, generate this once in .cpp file -//extern template class LLBottomTray* LLSingleton<class LLBottomTray>::getInstance(); +// Build time optimization, generate once in .cpp file +#ifndef LLBOTTOMTRAY_CPP +extern template class LLBottomTray* LLSingleton<class LLBottomTray>::getInstance(); +#endif class LLBottomTray : public LLSingleton<LLBottomTray> |