diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 19:10:43 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 19:10:43 -0800 |
| commit | c2ca71322bf48653d466cba40bbe01c3401318c7 (patch) | |
| tree | ecb9834f475c55dcf78c06aed115db69276068ef /indra/newview/llvoavatar.cpp | |
| parent | a0de48f0ccf7ab8181651646036a13f712641b54 (diff) | |
| parent | 433eb89473e9aaa3864299b7ba50a320f14bba38 (diff) | |
automated merge
Don't wanna fix all windows EOL issue here
warn-on-failure:unix-eol
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 863f40309d..86f4fc9b2d 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -56,7 +56,7 @@ #include "lldriverparam.h" #include "lleditingmotion.h" #include "llemote.h" -#include "llfirstuse.h" +//#include "llfirstuse.h" #include "llheadrotmotion.h" #include "llhudeffecttrail.h" #include "llhudmanager.h" @@ -5604,7 +5604,7 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object) if (isSelf()) { // Might be first sit - LLFirstUse::useSit(); + //LLFirstUse::useSit(); gAgent.setFlying(FALSE); gAgent.setThirdPersonHeadOffset(LLVector3::zero); |