diff options
author | richard <none@none> | 2010-01-15 10:15:57 -0800 |
---|---|---|
committer | richard <none@none> | 2010-01-15 10:15:57 -0800 |
commit | 109b79e9ad67b5fa8967442a47ef15e456eb5bff (patch) | |
tree | 9e39fc97573cc89b0b3c08507d7f2fe0cc57d979 /indra/newview/llvoavatar.cpp | |
parent | 5c09d482a47a8894ebebc9d3c8053b25a280f58e (diff) | |
parent | 4fab3145311da62501b927edafde80c8cf6eb250 (diff) |
merge
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); |