diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-25 01:02:29 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-25 01:02:29 +0300 |
| commit | 3d92a7dfe202b8987e24bbf6d877ada733c1757d (patch) | |
| tree | 35334a8704816942e0503c12cbd4af2dd04e3cf5 /indra/newview/llagent.h | |
| parent | fa8f1862130fdef81f83e977743299623a50b7c7 (diff) | |
| parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) | |
Merge branch 'master' into DRTVWR-520-apple-notarization
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index d46c99db8c..a792d3e11f 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -653,6 +653,7 @@ public: void restartFailedTeleportRequest(); void clearTeleportRequest(); void setMaturityRatingChangeDuringTeleport(U8 pMaturityRatingChange); + void sheduleTeleportIM(); private: @@ -669,6 +670,7 @@ private: boost::signals2::connection mTeleportFailedSlot; bool mIsMaturityRatingChangingDuringTeleport; + bool mTPNeedsNeabyChatSeparator; U8 mMaturityRatingChange; bool hasPendingTeleportRequest(); @@ -685,6 +687,7 @@ private: void handleTeleportFinished(); void handleTeleportFailed(); + static void addTPNearbyChatSeparator(); static void onCapabilitiesReceivedAfterTeleport(); //-------------------------------------------------------------------- |