livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Josh Bell 2008-05-02 21:44:39 +00:00
parent 36fccc3888
commit eb14fece83
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llversionserver.h
View File

@ -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";

1
indra/newview/llagent.cpp
View File

@ -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();
}

4
indra/newview/llviewermessage.cpp
View File

@ -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;