diff options
| author | angela <angela@lindenlab.com> | 2010-01-14 13:02:44 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-01-14 13:02:44 +0800 |
| commit | 402d2e7c9d58852e63ca00fbb464433089b478e1 (patch) | |
| tree | 098d05eebfd7e14ce5048197789f6a9ec0624e5e /indra/newview/llvoavatar.cpp | |
| parent | 8a2404fa3341db0bd7a60459e008b8a3c6afad03 (diff) | |
| parent | 82b073be87e332b7653e442ef3fd84af7376da8e (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
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 5958742db2..4235f97eab 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); |