diff options
author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
---|---|---|
committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
commit | e040f16a4f2e50592a125a04185fd9f06ac49522 (patch) | |
tree | 60a0e7fee37761a9278db6ab2b32f61fc38acbe1 /indra/newview/llmoveview.cpp | |
parent | c320b2cef916cc8f0e42f041c29c04bf55d40d77 (diff) | |
parent | 02701073ce70fc2e2043adf0ed7e0d6879669215 (diff) |
merge
Diffstat (limited to 'indra/newview/llmoveview.cpp')
-rw-r--r-- | indra/newview/llmoveview.cpp | 2 |
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; |