From 49fa9b5515e708083c85aaa2b1b522bc266944c4 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 21 Dec 2015 19:22:40 +0200 Subject: MAINT-335 FIXED Avatar hangs in space after cancelling teleport --- indra/newview/llagent.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llagent.h') diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 4830cb754b..a8689dd5a6 100755 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -616,6 +616,7 @@ public: void teleportViaLocation(const LLVector3d& pos_global); // To a global location - this will probably need to be deprecated void teleportViaLocationLookAt(const LLVector3d& pos_global);// To a global location, preserving camera rotation void teleportCancel(); // May or may not be allowed by server + void restoreCanceledTeleportRequest(); bool getTeleportKeepsLookAt() { return mbTeleportKeepsLookAt; } // Whether look-at reset after teleport protected: bool teleportCore(bool is_local = false); // Stuff for all teleports; returns true if the teleport can proceed @@ -638,6 +639,7 @@ private: friend class LLTeleportRequestViaLocationLookAt; LLTeleportRequestPtr mTeleportRequest; + LLTeleportRequestPtr mTeleportCanceled; boost::signals2::connection mTeleportFinishedSlot; boost::signals2::connection mTeleportFailedSlot; -- cgit v1.2.3 From c9c6966364ba59171313ec179b8b19f920ea6888 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 6 Jan 2016 20:28:44 +0200 Subject: MAINT-4488 [PUBLIC] llTakeControls(*,FALSE,TRUE) prevents left clicks from mouselook. --- indra/newview/llagent.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/newview/llagent.h') diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index a8689dd5a6..9e8550e280 100755 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -432,7 +432,8 @@ private: // Grab //-------------------------------------------------------------------- public: - BOOL leftButtonGrabbed() const; + BOOL leftButtonGrabbed() const; + BOOL leftButtonBlocked() const; BOOL rotateGrabbed() const; BOOL forwardGrabbed() const; BOOL backwardGrabbed() const; @@ -449,8 +450,9 @@ public: BOOL controlFlagsDirty() const; void enableControlFlagReset(); void resetControlFlags(); - BOOL anyControlGrabbed() const; // True iff a script has taken over a control - BOOL isControlGrabbed(S32 control_index) const; + BOOL anyControlGrabbed() const; // True if a script has taken over any control + BOOL isControlGrabbed(S32 control_index) const; // True if a script has taken over a control + BOOL isControlBlocked(S32 control_index) const; // Control should be ignored or won't be passed // Send message to simulator to force grabbed controls to be // released, in case of a poorly written script. void forceReleaseControls(); -- cgit v1.2.3