diff options
Diffstat (limited to 'indra/newview/llagent.h')
-rw-r--r-- | indra/newview/llagent.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 22e7ccc0e5..35ebc41909 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -44,6 +44,7 @@ #include "llcharacter.h" // LLAnimPauseRequest #include "llfollowcam.h" // Ventrella #include "llagentdata.h" // gAgentID, gAgentSessionID +#include "lluicolor.h" #include "llvoavatardefines.h" extern const BOOL ANIMATE; @@ -185,10 +186,7 @@ private: public: LLVOAvatarSelf* getAvatarObject() const { return mAvatarObject; } - const LLUUID& getInventoryRootID() const { return mInventoryRootID; } - LLUUID& getInventoryRootID() { return mInventoryRootID; } private: - LLUUID mInventoryRootID; LLPointer<LLVOAvatarSelf> mAvatarObject; // NULL until avatar object sent down from simulator /** General Accessors @@ -269,8 +267,6 @@ public: std::string getSLURL() const; BOOL inPrelude(); BOOL buildLocationString(std::string& str, ELocationFormat fmt = LOCATION_FORMAT_LANDMARK); // Utility to build a location string - static void createLandmarkHere(); - static void createLandmarkHere(const std::string& name, const std::string& desc, const LLUUID& folder_id); private: LLViewerRegion *mRegionp; @@ -382,6 +378,12 @@ private: bool mbRunning; // Is the avatar trying to run right now? //-------------------------------------------------------------------- + // Sit and stand + //-------------------------------------------------------------------- +public: + void standUp(); + + //-------------------------------------------------------------------- // Busy //-------------------------------------------------------------------- public: @@ -833,7 +835,7 @@ public: F32 mHUDTargetZoom; // Target zoom level for HUD objects (used when editing) F32 mHUDCurZoom; // Current animated zoom level for HUD objects private: - LLColor4 mEffectColor; + LLUIColor mEffectColor; /** Camera ** ** |