summaryrefslogtreecommitdiff
path: root/indra/newview/llmoveview.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2010-11-03 11:08:04 -0400
committerNat Goodspeed <nat@lindenlab.com>2010-11-03 11:08:04 -0400
commit2f6062e59793c8a5326c1dfac41334bac428faa9 (patch)
tree38f7e4b0a48358fb3657b26c73aa21171b8a60e5 /indra/newview/llmoveview.cpp
parenta26386c53a09d47eff092ad89b5684503ee31b9d (diff)
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.
Diffstat (limited to 'indra/newview/llmoveview.cpp')
-rw-r--r--indra/newview/llmoveview.cpp2
1 files changed, 1 insertions, 1 deletions
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;