summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-11-29 10:19:17 -0800
committerJames Cook <james@lindenlab.com>2009-11-29 10:19:17 -0800
commitb50ba67bd8ab329d598ce47e5d3ac09b59fffb63 (patch)
tree037646faeb05124426a09935b05bdbdef7e6dc1a /indra/newview
parent491cbc5de6eaa960ca582ac0fcc064c3c8bac08c (diff)
Revert extern template link optimization until I can build/test on PC
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llbottomtray.h2
-rw-r--r--indra/newview/llselectmgr.h2
-rw-r--r--indra/newview/llviewercamera.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index 3db5184f6b..30f5f88cce 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -48,7 +48,7 @@ class LLNearbyChatBar;
class LLIMChiclet;
// Build time optimization, generate this once in .cpp file
-extern template class LLBottomTray* LLSingleton<class LLBottomTray>::getInstance();
+//extern template class LLBottomTray* LLSingleton<class LLBottomTray>::getInstance();
class LLBottomTray
: public LLSingleton<LLBottomTray>
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 7a5c583711..57e0ee4e0e 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -324,7 +324,7 @@ private:
typedef LLSafeHandle<LLObjectSelection> LLObjectSelectionHandle;
// Build time optimization, generate this once in .cpp file
-extern template class LLSelectMgr* LLSingleton<class LLSelectMgr>::getInstance();
+//extern template class LLSelectMgr* LLSingleton<class LLSelectMgr>::getInstance();
class LLSelectMgr : public LLEditMenuHandler, public LLSingleton<LLSelectMgr>
{
diff --git a/indra/newview/llviewercamera.h b/indra/newview/llviewercamera.h
index 01fa86d7c5..bf561c3e4d 100644
--- a/indra/newview/llviewercamera.h
+++ b/indra/newview/llviewercamera.h
@@ -53,7 +53,7 @@ const BOOL FOR_SELECTION = TRUE;
const BOOL NOT_FOR_SELECTION = FALSE;
// Build time optimization, generate this once in .cpp file
-extern template class LLViewerCamera* LLSingleton<class LLViewerCamera>::getInstance();
+//extern template class LLViewerCamera* LLSingleton<class LLViewerCamera>::getInstance();
class LLViewerCamera : public LLCamera, public LLSingleton<LLViewerCamera>
{