diff options
author | Oz Linden <oz@lindenlab.com> | 2016-11-16 09:52:59 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-11-16 09:52:59 -0500 |
commit | fd2ccb16068dfd21307b17e78e384d8ae19fef12 (patch) | |
tree | 3e40dcddd3117820008047b81ec218e9cc0ffb7c /indra/newview/llmoveview.h | |
parent | 8baf88a073f30d217e03ee56b4a255121ac98071 (diff) | |
parent | ecd93e56781498ef73ea2a3d5be0c449179b6a0a (diff) |
merge changes for 4.1.2-release
Diffstat (limited to 'indra/newview/llmoveview.h')
-rw-r--r-- | indra/newview/llmoveview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h index c525d9dfdb..4a31f2a814 100644 --- a/indra/newview/llmoveview.h +++ b/indra/newview/llmoveview.h @@ -56,7 +56,7 @@ public: static void setAlwaysRunMode(bool run); void setAlwaysRunModeImpl(bool run); static void setSittingMode(BOOL bSitting); - static void enableInstance(BOOL bEnable); + static void enableInstance(); /*virtual*/ void onOpen(const LLSD& key); static void sUpdateFlyingStatus(); |