diff options
author | Armin Weatherwax | 2010-02-20 17:07:34 +0100 |
---|---|---|
committer | Armin Weatherwax | 2010-04-28 19:15:02 +0200 |
commit | ac1eed6ff3e2ef03858256da76fd8408dcc79e9a (patch) | |
tree | 33ee9ac87dfd08b7c98a22a2023de134c2574d84 /linden/indra/newview/llagent.h | |
parent | Merge commit 'jacek/next' into next (diff) | |
download | meta-impy-ac1eed6ff3e2ef03858256da76fd8408dcc79e9a.zip meta-impy-ac1eed6ff3e2ef03858256da76fd8408dcc79e9a.tar.gz meta-impy-ac1eed6ff3e2ef03858256da76fd8408dcc79e9a.tar.bz2 meta-impy-ac1eed6ff3e2ef03858256da76fd8408dcc79e9a.tar.xz |
fix: crash on relog; appearence self pie greyed out after relog.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llagent.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h index a6f1d74..798de8c 100644 --- a/linden/indra/newview/llagent.h +++ b/linden/indra/newview/llagent.h | |||
@@ -796,9 +796,11 @@ private: | |||
796 | std::set<U64> mRegionsVisited; // stat - what distinct regions has the avatar been to? | 796 | std::set<U64> mRegionsVisited; // stat - what distinct regions has the avatar been to? |
797 | F64 mDistanceTraveled; // stat - how far has the avatar moved? | 797 | F64 mDistanceTraveled; // stat - how far has the avatar moved? |
798 | LLVector3d mLastPositionGlobal; // Used to calculate travel distance | 798 | LLVector3d mLastPositionGlobal; // Used to calculate travel distance |
799 | protected: | ||
799 | 800 | ||
800 | LLPointer<LLVOAvatar> mAvatarObject; // NULL until avatar object sent down from simulator | ||
801 | 801 | ||
802 | LLPointer<LLVOAvatar> mAvatarObject; // NULL until avatar object sent down from simulator | ||
803 | private: | ||
802 | U8 mRenderState; // Current behavior state of agent | 804 | U8 mRenderState; // Current behavior state of agent |
803 | LLFrameTimer mTypingTimer; | 805 | LLFrameTimer mTypingTimer; |
804 | 806 | ||
@@ -912,6 +914,7 @@ private: | |||
912 | S32 mCurrentFidget; | 914 | S32 mCurrentFidget; |
913 | BOOL mFirstLogin; | 915 | BOOL mFirstLogin; |
914 | BOOL mGenderChosen; | 916 | BOOL mGenderChosen; |
917 | |||
915 | 918 | ||
916 | //-------------------------------------------------------------------- | 919 | //-------------------------------------------------------------------- |
917 | // Wearables | 920 | // Wearables |