diff options
| -rw-r--r-- | indra/llcommon/llversionserver.h | 2 | ||||
| -rw-r--r-- | indra/newview/llagent.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index aeab793c9a..291f6d6347 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 21; const S32 LL_VERSION_PATCH = 1; -const S32 LL_VERSION_BUILD = 85989; +const S32 LL_VERSION_BUILD = 86526; const char * const LL_CHANNEL = "Second Life Server"; diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index f084234c9f..7ce985542f 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -5823,6 +5823,7 @@ void LLAgent::teleportViaLure(const LLUUID& lure_id, BOOL godlike) msg->addUUIDFast(_PREHASH_AgentID, getID()); msg->addUUIDFast(_PREHASH_SessionID, getSessionID()); msg->addUUIDFast(_PREHASH_LureID, lure_id); + // teleport_flags is a legacy field, now derived sim-side: msg->addU32("TeleportFlags", teleport_flags); sendReliableMessage(); } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index c157b5790c..5b16b81639 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1278,10 +1278,6 @@ void lure_callback(S32 option, void* user_data) case 0: { // accept - send_simple_im(info->mFromID, - "", - IM_LURE_ACCEPTED, - info->mLureID); gAgent.teleportViaLure(info->mLureID, info->mGodlike); } break; |