From 2f6062e59793c8a5326c1dfac41334bac428faa9 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 3 Nov 2010 11:08:04 -0400 Subject: Remove erroneous 'inline' on LLPanelStandStopFlying::getInstance() This is ignored by every compiler except Linux g++ 4.4.3 in Release mode. In that case, it literally does cause getInstance() to be inlined, therefore llmoveview.o contains no such symbol, therefore the Linux viewer link fails in Release mode. But for a method implementation in a .cpp file of a method declared in a .h file, 'inline' is just wrong. Removing it fixes Release build. --- indra/newview/llmoveview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 6658e1d7e8..d38bb5aa4a 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -552,7 +552,7 @@ LLPanelStandStopFlying::LLPanelStandStopFlying() : } // static -inline LLPanelStandStopFlying* LLPanelStandStopFlying::getInstance() +LLPanelStandStopFlying* LLPanelStandStopFlying::getInstance() { static LLPanelStandStopFlying* panel = getStandStopFlyingPanel(); return panel; -- cgit v1.2.3