diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-11-19 16:13:51 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-11-19 16:13:51 -0800 |
| commit | 7a74f64d5eda050da0d966b0fa3e76b4b54888fa (patch) | |
| tree | b3cee2fdcf01e11cf13dca58f56c3b1d0e804739 /indra/newview/llmoveview.cpp | |
| parent | b48dad17260a7f5fbfc4d0548b4386d62efc2e5e (diff) | |
| parent | 9d3174c0386e6eefba1949075971ce7f75571394 (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; |