From eb14fece837683ebc58540d7f10eb74f5a5fbd4e Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Fri, 2 May 2008 21:44:39 +0000
Subject: svn merge -r 86069:86558
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server -->
release
* QAR-522 / DEV-14318: Crash in LLSD:operator[] -- web connected? Traceback includes LLCurl::Responder::completed
* landstore-6 dataservices
* DEV-14141 - Enable avatar-properties. done 2008-05-01 14:00
* new query, for use by sl.com /lib/models/login.php
* disabling evil slave crashing query.
Also the following which has NOT been pushed into production yet
* QAR-531 DEV-14457 SEC-67 Hacked client can bypass estate access lists
---
indra/llcommon/llversionserver.h | 2 +-
indra/newview/llagent.cpp | 1 +
indra/newview/llviewermessage.cpp | 4 ----
3 files changed, 2 insertions(+), 5 deletions(-)
(limited to 'indra')
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;
--
cgit v1.2.3