diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-12-03 19:36:44 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-12-03 19:36:44 +0000 |
| commit | d5eef2d8a6cc0d5855d68d0726565e07d46211b2 (patch) | |
| tree | 0138cd5a59971a52b20627f28af4197198f4e2f9 /indra/newview/llagent.h | |
| parent | 7b7dd4e6f61aa731ef7f9f255014f5b76d5b9fec (diff) | |
merge -r 73391:74133 maint-ui-3 -> release
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index c6de97fede..4e9b882250 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -169,7 +169,8 @@ public: void setRegion(LLViewerRegion *regionp); LLViewerRegion *getRegion() const; const LLHost& getRegionHost() const; - + std::string getSLURL() const; + void updateAgentPosition(const F32 dt, const F32 yaw, const S32 mouse_x, const S32 mouse_y); // call once per frame to update position, angles radians void updateLookAt(const S32 mouse_x, const S32 mouse_y); @@ -306,7 +307,7 @@ public: LLVector3 getVelocity() const; F32 getVelocityZ() const { return getVelocity().mV[VZ]; } // a hack - const LLVector3d &getPositionGlobal(); + const LLVector3d &getPositionGlobal() const; const LLVector3 &getPositionAgent(); S32 getRegionsVisited() const; F64 getDistanceTraveled() const; @@ -463,6 +464,8 @@ public: void setTargetVelocity(const LLVector3 &vel); const LLVector3 &getTargetVelocity() const; + const std::string getTeleportSourceSLURL() const { return mTeleportSourceSLURL; } + // Setting the ability for this avatar to proxy for another avatar. //static void processAddModifyAbility(LLMessageSystem* msg, void**); @@ -717,6 +720,8 @@ private: LLVector3d mAgentOriginGlobal; // Origin of agent coords from global coords mutable LLVector3d mPositionGlobal; + std::string mTeleportSourceSLURL; // SLURL where last TP began. + std::set<U64> mRegionsVisited; // stat - what distinct regions has the avatar been to? F64 mDistanceTraveled; // stat - how far has the avatar moved? LLVector3d mLastPositionGlobal; // Used to calculate travel distance |