From b50ba67bd8ab329d598ce47e5d3ac09b59fffb63 Mon Sep 17 00:00:00 2001 From: James Cook Date: Sun, 29 Nov 2009 10:19:17 -0800 Subject: Revert extern template link optimization until I can build/test on PC --- indra/newview/llbottomtray.h | 2 +- indra/newview/llselectmgr.h | 2 +- indra/newview/llviewercamera.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview') 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::getInstance(); +//extern template class LLBottomTray* LLSingleton::getInstance(); class LLBottomTray : public LLSingleton 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 LLObjectSelectionHandle; // Build time optimization, generate this once in .cpp file -extern template class LLSelectMgr* LLSingleton::getInstance(); +//extern template class LLSelectMgr* LLSingleton::getInstance(); class LLSelectMgr : public LLEditMenuHandler, public LLSingleton { 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::getInstance(); +//extern template class LLViewerCamera* LLSingleton::getInstance(); class LLViewerCamera : public LLCamera, public LLSingleton { -- cgit v1.2.3