summaryrefslogtreecommitdiff
path: root/indra/newview/llmoveview.cpp
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2010-11-18 15:36:11 -0800
committerMark Palange (Mani) <palange@lindenlab.com>2010-11-18 15:36:11 -0800
commit6802775bc4952874e26f320e1ec7ce9f7ed2e2fb (patch)
treefb5b9b355214fe5ab949ff62ad5146d49557c2e0 /indra/newview/llmoveview.cpp
parent327a922dc9cda771077826ecf7521464ebd281c0 (diff)
parent0e52564f0a36365c2ce5f5263d15778394741fde (diff)
Merge with viewer-development
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;