diff options
Diffstat (limited to 'linden/indra/newview/llagent.cpp')
-rw-r--r-- | linden/indra/newview/llagent.cpp | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp index 6359794..1193d22 100644 --- a/linden/indra/newview/llagent.cpp +++ b/linden/indra/newview/llagent.cpp | |||
@@ -6139,6 +6139,30 @@ void LLAgent::teleportViaLocation(const LLVector3d& pos_global) | |||
6139 | } | 6139 | } |
6140 | } | 6140 | } |
6141 | 6141 | ||
6142 | |||
6143 | void LLAgent::teleportHome() | ||
6144 | { | ||
6145 | teleportViaLandmark(LLUUID::null); | ||
6146 | } | ||
6147 | |||
6148 | void LLAgent::teleportHomeConfirm() | ||
6149 | { | ||
6150 | LLNotifications::instance().add("ConfirmTeleportHome", LLSD(), LLSD(), &LLAgent::teleportHomeCallback); | ||
6151 | } | ||
6152 | |||
6153 | // static | ||
6154 | bool LLAgent::teleportHomeCallback( const LLSD& notification, const LLSD& response ) | ||
6155 | { | ||
6156 | S32 option = LLNotification::getSelectedOption(notification, response); | ||
6157 | if( option == 0 ) | ||
6158 | { | ||
6159 | // They confirmed it. Here we go! | ||
6160 | gAgent.teleportHome(); | ||
6161 | } | ||
6162 | return false; | ||
6163 | } | ||
6164 | |||
6165 | |||
6142 | void LLAgent::setTeleportState(ETeleportState state) | 6166 | void LLAgent::setTeleportState(ETeleportState state) |
6143 | { | 6167 | { |
6144 | mTeleportState = state; | 6168 | mTeleportState = state; |
@@ -7668,6 +7692,26 @@ void LLAgent::userRemoveWearable( void* userdata ) | |||
7668 | } | 7692 | } |
7669 | } | 7693 | } |
7670 | 7694 | ||
7695 | |||
7696 | // static | ||
7697 | void LLAgent::userRemoveAllClothesConfirm() | ||
7698 | { | ||
7699 | LLNotifications::instance().add("ConfirmRemoveAllClothes", LLSD(), LLSD(), LLAgent::userRemoveAllClothesCallback); | ||
7700 | } | ||
7701 | |||
7702 | // static | ||
7703 | bool LLAgent::userRemoveAllClothesCallback( const LLSD& notification, const LLSD& response ) | ||
7704 | { | ||
7705 | S32 option = LLNotification::getSelectedOption(notification, response); | ||
7706 | if( option == 0 ) | ||
7707 | { | ||
7708 | // They confirmed it. Here we go! | ||
7709 | LLAgent::userRemoveAllClothes(NULL); | ||
7710 | } | ||
7711 | return false; | ||
7712 | } | ||
7713 | |||
7714 | |||
7671 | void LLAgent::userRemoveAllClothes( void* userdata ) | 7715 | void LLAgent::userRemoveAllClothes( void* userdata ) |
7672 | { | 7716 | { |
7673 | // We have to do this up front to avoid having to deal with the case of multiple wearables being dirty. | 7717 | // We have to do this up front to avoid having to deal with the case of multiple wearables being dirty. |