diff --git a/indra/llinventory/lllandmark.cpp b/indra/llinventory/lllandmark.cpp
index bd7ab3c2c8f1bdc62b91c7181f3feb10258dc47f..6f2c7b0da1cf5f215f5ed0192a8a78517b56d3f8 100644
--- a/indra/llinventory/lllandmark.cpp
+++ b/indra/llinventory/lllandmark.cpp
@@ -250,9 +250,9 @@ void LLLandmark::requestRegionHandle(
}
LL_DEBUGS("Landmark") << "Landmark requesting information about: "
<< region_id << LL_ENDL;
- msg->newMessage("RegionHandleRequest");
- msg->nextBlock("RequestBlock");
- msg->addUUID("RegionID", region_id);
+ msg->newMessageFast(_PREHASH_RegionHandleRequest);
+ msg->nextBlockFast(_PREHASH_RequestBlock);
+ msg->addUUIDFast(_PREHASH_RegionID, region_id);
msg->sendReliable(upstream_host);
}
else if(callback)
@@ -280,12 +280,12 @@ void LLLandmark::setRegionHandle(const LLUUID& region_id, U64 region_handle)
void LLLandmark::processRegionIDAndHandle(LLMessageSystem* msg, void**)
{
LLUUID region_id;
- msg->getUUID("ReplyBlock", "RegionID", region_id);
+ msg->getUUIDFast(_PREHASH_ReplyBlock, _PREHASH_RegionID, region_id);
mRegions.erase(region_id);
CacheInfo info;
const F32 CACHE_EXPIRY_SECONDS = 60.0f * 10.0f; // ten minutes
info.mTimer.setTimerExpirySec(CACHE_EXPIRY_SECONDS);
- msg->getU64("ReplyBlock", "RegionHandle", info.mRegionHandle);
+ msg->getU64Fast(_PREHASH_ReplyBlock, _PREHASH_RegionHandle, info.mRegionHandle);
region_map_t::value_type vt(region_id, info);
mRegions.insert(vt);
diff --git a/indra/llmessage/llcircuit.cpp b/indra/llmessage/llcircuit.cpp
index abe144825dfb6e41f0a2413c0dc9c22fe6b40198..de66b98f5d0ad18bb5e223080851fc00b473f136 100644
--- a/indra/llmessage/llcircuit.cpp
+++ b/indra/llmessage/llcircuit.cpp
@@ -951,7 +951,7 @@ BOOL LLCircuitData::updateWatchDogTimers(LLMessageSystem *msgsys)
// Send off the another ping.
pingTimerStart();
msgsys->newMessageFast(_PREHASH_StartPingCheck);
- msgsys->nextBlock(_PREHASH_PingID);
+ msgsys->nextBlockFast(_PREHASH_PingID);
msgsys->addU8Fast(_PREHASH_PingID, nextPingID());
msgsys->addU32Fast(_PREHASH_OldestUnacked, packet_id);
msgsys->sendMessage(mHost);
diff --git a/indra/llmessage/lltransfermanager.cpp b/indra/llmessage/lltransfermanager.cpp
index 9317af61f43970367176902c9770a9a46721a423..1cdb2f79b12d926270f92ebe60fa77fb1a50c95f 100644
--- a/indra/llmessage/lltransfermanager.cpp
+++ b/indra/llmessage/lltransfermanager.cpp
@@ -81,10 +81,10 @@ void LLTransferManager::init()
mValid = TRUE;
// Register message system handlers
- gMessageSystem->setHandlerFunc("TransferRequest", processTransferRequest, NULL);
- gMessageSystem->setHandlerFunc("TransferInfo", processTransferInfo, NULL);
- gMessageSystem->setHandlerFunc("TransferPacket", processTransferPacket, NULL);
- gMessageSystem->setHandlerFunc("TransferAbort", processTransferAbort, NULL);
+ gMessageSystem->setHandlerFuncFast(_PREHASH_TransferRequest, processTransferRequest, NULL);
+ gMessageSystem->setHandlerFuncFast(_PREHASH_TransferInfo, processTransferInfo, NULL);
+ gMessageSystem->setHandlerFuncFast(_PREHASH_TransferPacket, processTransferPacket, NULL);
+ gMessageSystem->setHandlerFuncFast(_PREHASH_TransferAbort, processTransferAbort, NULL);
}
@@ -212,17 +212,17 @@ void LLTransferManager::processTransferRequest(LLMessageSystem *msgp, void **)
LLTransferChannelType channel_type;
F32 priority;
- msgp->getUUID("TransferInfo", "TransferID", transfer_id);
+ msgp->getUUIDFast(_PREHASH_TransferInfo, _PREHASH_TransferID, transfer_id);
S32 temp_source_type;
- msgp->getS32("TransferInfo", "SourceType", temp_source_type);
+ msgp->getS32Fast(_PREHASH_TransferInfo, _PREHASH_SourceType, temp_source_type);
source_type = (LLTransferSourceType)temp_source_type;
S32 temp_channel_type;
- msgp->getS32("TransferInfo", "ChannelType", temp_channel_type);
+ msgp->getS32Fast(_PREHASH_TransferInfo, _PREHASH_ChannelType, temp_channel_type);
channel_type = (LLTransferChannelType)temp_channel_type;
- msgp->getF32("TransferInfo", "Priority", priority);
+ msgp->getF32Fast(_PREHASH_TransferInfo, _PREHASH_Priority, priority);
LLTransferSourceChannel *tscp = gTransferManager.getSourceChannel(msgp->getSender(), channel_type);
@@ -238,7 +238,7 @@ void LLTransferManager::processTransferRequest(LLMessageSystem *msgp, void **)
return;
}
- S32 size = msgp->getSize("TransferInfo", "Params");
+ S32 size = msgp->getSizeFast(_PREHASH_TransferInfo, _PREHASH_Params);
if(size > MAX_PARAMS_SIZE)
{
LL_WARNS() << "LLTransferManager::processTransferRequest params too big."
@@ -258,7 +258,7 @@ void LLTransferManager::processTransferRequest(LLMessageSystem *msgp, void **)
return;
}
U8 tmp[MAX_PARAMS_SIZE];
- msgp->getBinaryData("TransferInfo", "Params", tmp, size);
+ msgp->getBinaryDataFast(_PREHASH_TransferInfo, _PREHASH_Params, tmp, size);
LLDataPackerBinaryBuffer dpb(tmp, MAX_PARAMS_SIZE);
BOOL unpack_ok = tsp->unpackParams(dpb);
@@ -288,17 +288,17 @@ void LLTransferManager::processTransferInfo(LLMessageSystem *msgp, void **)
LLTSCode status;
S32 size;
- msgp->getUUID("TransferInfo", "TransferID", transfer_id);
+ msgp->getUUIDFast(_PREHASH_TransferInfo, _PREHASH_TransferID, transfer_id);
S32 temp_channel_type;
- msgp->getS32("TransferInfo", "ChannelType", temp_channel_type);
+ msgp->getS32Fast(_PREHASH_TransferInfo, _PREHASH_ChannelType, temp_channel_type);
channel_type = (LLTransferChannelType)temp_channel_type;
S32 temp_status;
- msgp->getS32("TransferInfo", "Status", temp_status);
+ msgp->getS32Fast(_PREHASH_TransferInfo, _PREHASH_Status, temp_status);
status = (LLTSCode)temp_status;
- msgp->getS32("TransferInfo", "Size", size);
+ msgp->getS32Fast(_PREHASH_TransferInfo, _PREHASH_Size, size);
//LL_INFOS() << transfer_id << ":" << target_type<< ":" << channel_type << LL_ENDL;
LLTransferTargetChannel *ttcp = gTransferManager.getTargetChannel(msgp->getSender(), channel_type);
@@ -328,7 +328,7 @@ void LLTransferManager::processTransferInfo(LLMessageSystem *msgp, void **)
}
// unpack the params
- S32 params_size = msgp->getSize("TransferInfo", "Params");
+ S32 params_size = msgp->getSizeFast(_PREHASH_TransferInfo, _PREHASH_Params);
if(params_size > MAX_PARAMS_SIZE)
{
LL_WARNS() << "LLTransferManager::processTransferInfo params too big."
@@ -338,7 +338,7 @@ void LLTransferManager::processTransferInfo(LLMessageSystem *msgp, void **)
else if(params_size > 0)
{
U8 tmp[MAX_PARAMS_SIZE];
- msgp->getBinaryData("TransferInfo", "Params", tmp, params_size);
+ msgp->getBinaryDataFast(_PREHASH_TransferInfo, _PREHASH_Params, tmp, params_size);
LLDataPackerBinaryBuffer dpb(tmp, MAX_PARAMS_SIZE);
if (!ttp->unpackParams(dpb))
{
@@ -431,16 +431,16 @@ void LLTransferManager::processTransferPacket(LLMessageSystem *msgp, void **)
S32 packet_id;
LLTSCode status;
S32 size;
- msgp->getUUID("TransferData", "TransferID", transfer_id);
+ msgp->getUUIDFast(_PREHASH_TransferData, _PREHASH_TransferID, transfer_id);
S32 temp_channel_type;
- msgp->getS32("TransferData", "ChannelType", temp_channel_type);
+ msgp->getS32Fast(_PREHASH_TransferData, _PREHASH_ChannelType, temp_channel_type);
channel_type = (LLTransferChannelType)temp_channel_type;
- msgp->getS32("TransferData", "Packet", packet_id);
+ msgp->getS32Fast(_PREHASH_TransferData, _PREHASH_Packet, packet_id);
S32 temp_status;
- msgp->getS32("TransferData", "Status", temp_status);
+ msgp->getS32Fast(_PREHASH_TransferData, _PREHASH_Status, temp_status);
status = (LLTSCode)temp_status;
// Find the transfer associated with this packet.
@@ -461,7 +461,7 @@ void LLTransferManager::processTransferPacket(LLMessageSystem *msgp, void **)
return;
}
- size = msgp->getSize("TransferData", "Data");
+ size = msgp->getSizeFast(_PREHASH_TransferData, _PREHASH_Data);
S32 msg_bytes = 0;
if (msgp->getReceiveCompressedSize())
@@ -484,7 +484,7 @@ void LLTransferManager::processTransferPacket(LLMessageSystem *msgp, void **)
if (size > 0)
{
// Only pull the data out if the size is > 0
- msgp->getBinaryData("TransferData", "Data", tmp_data, size);
+ msgp->getBinaryDataFast(_PREHASH_TransferData, _PREHASH_Data, tmp_data, size);
}
if ((!ttp->gotInfo()) || (ttp->getNextPacketID() != packet_id))
@@ -589,10 +589,10 @@ void LLTransferManager::processTransferAbort(LLMessageSystem *msgp, void **)
LLUUID transfer_id;
LLTransferChannelType channel_type;
- msgp->getUUID("TransferInfo", "TransferID", transfer_id);
+ msgp->getUUIDFast(_PREHASH_TransferInfo, _PREHASH_TransferID, transfer_id);
S32 temp_channel_type;
- msgp->getS32("TransferInfo", "ChannelType", temp_channel_type);
+ msgp->getS32Fast(_PREHASH_TransferInfo, _PREHASH_ChannelType, temp_channel_type);
channel_type = (LLTransferChannelType)temp_channel_type;
// See if it's a target that we're trying to abort
@@ -836,13 +836,13 @@ void LLTransferSourceChannel::updateTransfers()
// Send the data now, even if it's an error.
// The status code will tell the other end what to do.
- gMessageSystem->newMessage("TransferPacket");
- gMessageSystem->nextBlock("TransferData");
- gMessageSystem->addUUID("TransferID", tsp->getID());
- gMessageSystem->addS32("ChannelType", getChannelType());
- gMessageSystem->addS32("Packet", packet_id); // HACK! Need to put in a REAL packet id
- gMessageSystem->addS32("Status", status);
- gMessageSystem->addBinaryData("Data", datap, data_size);
+ gMessageSystem->newMessageFast(_PREHASH_TransferPacket);
+ gMessageSystem->nextBlockFast(_PREHASH_TransferData);
+ gMessageSystem->addUUIDFast(_PREHASH_TransferID, tsp->getID());
+ gMessageSystem->addS32Fast(_PREHASH_ChannelType, getChannelType());
+ gMessageSystem->addS32Fast(_PREHASH_Packet, packet_id); // HACK! Need to put in a REAL packet id
+ gMessageSystem->addS32Fast(_PREHASH_Status, status);
+ gMessageSystem->addBinaryDataFast(_PREHASH_Data, datap, data_size);
sent_bytes = gMessageSystem->getCurrentSendTotal();
gMessageSystem->sendReliable(getHost(), LL_DEFAULT_RELIABLE_RETRIES, TRUE, F32Seconds(0.f),
LLTransferManager::reliablePacketCallback, (void**)cb_uuid);
@@ -1002,18 +1002,18 @@ void LLTransferTargetChannel::sendTransferRequest(LLTransferTarget *targetp,
llassert(targetp);
llassert(targetp->getChannel() == this);
- gMessageSystem->newMessage("TransferRequest");
- gMessageSystem->nextBlock("TransferInfo");
- gMessageSystem->addUUID("TransferID", targetp->getID());
- gMessageSystem->addS32("SourceType", params.getType());
- gMessageSystem->addS32("ChannelType", getChannelType());
- gMessageSystem->addF32("Priority", priority);
+ gMessageSystem->newMessageFast(_PREHASH_TransferRequest);
+ gMessageSystem->nextBlockFast(_PREHASH_TransferInfo);
+ gMessageSystem->addUUIDFast(_PREHASH_TransferID, targetp->getID());
+ gMessageSystem->addS32Fast(_PREHASH_SourceType, params.getType());
+ gMessageSystem->addS32Fast(_PREHASH_ChannelType, getChannelType());
+ gMessageSystem->addF32Fast(_PREHASH_Priority, priority);
U8 tmp[MAX_PARAMS_SIZE];
LLDataPackerBinaryBuffer dp(tmp, MAX_PARAMS_SIZE);
params.packParams(dp);
S32 len = dp.getCurrentSize();
- gMessageSystem->addBinaryData("Params", tmp, len);
+ gMessageSystem->addBinaryDataFast(_PREHASH_Params, tmp, len);
gMessageSystem->sendReliable(mHost);
}
@@ -1092,18 +1092,18 @@ LLTransferSource::~LLTransferSource()
void LLTransferSource::sendTransferStatus(LLTSCode status)
{
- gMessageSystem->newMessage("TransferInfo");
- gMessageSystem->nextBlock("TransferInfo");
- gMessageSystem->addUUID("TransferID", getID());
- gMessageSystem->addS32("TargetType", LLTTT_UNKNOWN);
- gMessageSystem->addS32("ChannelType", mChannelp->getChannelType());
- gMessageSystem->addS32("Status", status);
- gMessageSystem->addS32("Size", mSize);
+ gMessageSystem->newMessageFast(_PREHASH_TransferInfo);
+ gMessageSystem->nextBlockFast(_PREHASH_TransferInfo);
+ gMessageSystem->addUUIDFast(_PREHASH_TransferID, getID());
+ gMessageSystem->addS32Fast(_PREHASH_TargetType, LLTTT_UNKNOWN);
+ gMessageSystem->addS32Fast(_PREHASH_ChannelType, mChannelp->getChannelType());
+ gMessageSystem->addS32Fast(_PREHASH_Status, status);
+ gMessageSystem->addS32Fast(_PREHASH_Size, mSize);
U8 tmp[MAX_PARAMS_SIZE];
LLDataPackerBinaryBuffer dp(tmp, MAX_PARAMS_SIZE);
packParams(dp);
S32 len = dp.getCurrentSize();
- gMessageSystem->addBinaryData("Params", tmp, len);
+ gMessageSystem->addBinaryDataFast(_PREHASH_Params, tmp, len);
gMessageSystem->sendReliable(mChannelp->getHost());
// Abort if there was as asset system issue.
@@ -1122,10 +1122,10 @@ void LLTransferSource::abortTransfer()
{
// Send a message down, call the completion callback
LL_INFOS() << "LLTransferSource::Aborting transfer " << getID() << " to " << mChannelp->getHost() << LL_ENDL;
- gMessageSystem->newMessage("TransferAbort");
- gMessageSystem->nextBlock("TransferInfo");
- gMessageSystem->addUUID("TransferID", getID());
- gMessageSystem->addS32("ChannelType", mChannelp->getChannelType());
+ gMessageSystem->newMessageFast(_PREHASH_TransferAbort);
+ gMessageSystem->nextBlockFast(_PREHASH_TransferInfo);
+ gMessageSystem->addUUIDFast(_PREHASH_TransferID, getID());
+ gMessageSystem->addS32Fast(_PREHASH_ChannelType, mChannelp->getChannelType());
gMessageSystem->sendReliable(mChannelp->getHost());
completionCallback(LLTS_ABORT);
@@ -1255,10 +1255,10 @@ void LLTransferTarget::abortTransfer()
{
// Send a message up, call the completion callback
LL_INFOS() << "LLTransferTarget::Aborting transfer " << getID() << " from " << mChannelp->getHost() << LL_ENDL;
- gMessageSystem->newMessage("TransferAbort");
- gMessageSystem->nextBlock("TransferInfo");
- gMessageSystem->addUUID("TransferID", getID());
- gMessageSystem->addS32("ChannelType", mChannelp->getChannelType());
+ gMessageSystem->newMessageFast(_PREHASH_TransferAbort);
+ gMessageSystem->nextBlockFast(_PREHASH_TransferInfo);
+ gMessageSystem->addUUIDFast(_PREHASH_TransferID, getID());
+ gMessageSystem->addS32Fast(_PREHASH_ChannelType, mChannelp->getChannelType());
gMessageSystem->sendReliable(mChannelp->getHost());
completionCallback(LLTS_ABORT);
diff --git a/indra/llmessage/llxfer_file.cpp b/indra/llmessage/llxfer_file.cpp
index 4c5a02c8593cdc410c4e1941d6b9272031355fe1..fac1379e70e24145b55d5c1e6f4bb8c14c6877d2 100644
--- a/indra/llmessage/llxfer_file.cpp
+++ b/indra/llmessage/llxfer_file.cpp
@@ -172,9 +172,9 @@ S32 LLXfer_File::startDownload()
gMessageSystem->nextBlockFast(_PREHASH_XferID);
gMessageSystem->addU64Fast(_PREHASH_ID, mID);
gMessageSystem->addStringFast(_PREHASH_Filename, mRemoteFilename);
- gMessageSystem->addU8("FilePath", (U8) mRemotePath);
- gMessageSystem->addBOOL("DeleteOnCompletion", mDeleteRemoteOnCompletion);
- gMessageSystem->addBOOL("UseBigPackets", BOOL(mChunkSize == LL_XFER_LARGE_PAYLOAD));
+ gMessageSystem->addU8Fast(_PREHASH_FilePath, (U8) mRemotePath);
+ gMessageSystem->addBOOLFast(_PREHASH_DeleteOnCompletion, mDeleteRemoteOnCompletion);
+ gMessageSystem->addBOOLFast(_PREHASH_UseBigPackets, BOOL(mChunkSize == LL_XFER_LARGE_PAYLOAD));
gMessageSystem->addUUIDFast(_PREHASH_VFileID, LLUUID::null);
gMessageSystem->addS16Fast(_PREHASH_VFileType, -1);
diff --git a/indra/llmessage/llxfer_mem.cpp b/indra/llmessage/llxfer_mem.cpp
index da8534ecdcbb260a77261dbbe39aea77b6d2a0ce..2e6fef65dd7651e2f01336620440e081cfdf7ad3 100644
--- a/indra/llmessage/llxfer_mem.cpp
+++ b/indra/llmessage/llxfer_mem.cpp
@@ -162,9 +162,9 @@ S32 LLXfer_Mem::startDownload()
gMessageSystem->nextBlockFast(_PREHASH_XferID);
gMessageSystem->addU64Fast(_PREHASH_ID, mID);
gMessageSystem->addStringFast(_PREHASH_Filename, mRemoteFilename);
- gMessageSystem->addU8("FilePath", (U8) mRemotePath);
- gMessageSystem->addBOOL("DeleteOnCompletion", mDeleteRemoteOnCompletion);
- gMessageSystem->addBOOL("UseBigPackets", BOOL(mChunkSize == LL_XFER_LARGE_PAYLOAD));
+ gMessageSystem->addU8Fast(_PREHASH_FilePath, (U8) mRemotePath);
+ gMessageSystem->addBOOLFast(_PREHASH_DeleteOnCompletion, mDeleteRemoteOnCompletion);
+ gMessageSystem->addBOOLFast(_PREHASH_UseBigPackets, BOOL(mChunkSize == LL_XFER_LARGE_PAYLOAD));
gMessageSystem->addUUIDFast(_PREHASH_VFileID, LLUUID::null);
gMessageSystem->addS16Fast(_PREHASH_VFileType, -1);
diff --git a/indra/llmessage/llxfer_vfile.cpp b/indra/llmessage/llxfer_vfile.cpp
index 0a1973a366879a062c5ab34865cddae3cbb64731..18cd5e791d457d7c731d2fb14c34972ae7e92253 100644
--- a/indra/llmessage/llxfer_vfile.cpp
+++ b/indra/llmessage/llxfer_vfile.cpp
@@ -154,9 +154,9 @@ S32 LLXfer_VFile::startDownload()
gMessageSystem->nextBlockFast(_PREHASH_XferID);
gMessageSystem->addU64Fast(_PREHASH_ID, mID);
gMessageSystem->addStringFast(_PREHASH_Filename, "");
- gMessageSystem->addU8("FilePath", (U8) LL_PATH_NONE);
- gMessageSystem->addBOOL("DeleteOnCompletion", FALSE);
- gMessageSystem->addBOOL("UseBigPackets", BOOL(mChunkSize == LL_XFER_LARGE_PAYLOAD));
+ gMessageSystem->addU8Fast(_PREHASH_FilePath, (U8) LL_PATH_NONE);
+ gMessageSystem->addBOOLFast(_PREHASH_DeleteOnCompletion, FALSE);
+ gMessageSystem->addBOOLFast(_PREHASH_UseBigPackets, BOOL(mChunkSize == LL_XFER_LARGE_PAYLOAD));
gMessageSystem->addUUIDFast(_PREHASH_VFileID, mRemoteID);
gMessageSystem->addS16Fast(_PREHASH_VFileType, (S16)mType);
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index 48aa24bc0efb7dcc925bdde368bf7772c5b8b4ca..863436ee4bafa5823ec0833b1a19484fee1a2d8d 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -1767,7 +1767,7 @@ void process_start_ping_check(LLMessageSystem *msgsystem, void** /*user_data*/)
// Send off the response
msgsystem->newMessageFast(_PREHASH_CompletePingCheck);
msgsystem->nextBlockFast(_PREHASH_PingID);
- msgsystem->addU8(_PREHASH_PingID, ping_id);
+ msgsystem->addU8Fast(_PREHASH_PingID, ping_id);
msgsystem->sendMessage(msgsystem->getSender());
}
@@ -2001,17 +2001,17 @@ void LLMessageSystem::processUseCircuitCode(LLMessageSystem* msg,
void LLMessageSystem::processError(LLMessageSystem* msg, void**)
{
S32 error_code = 0;
- msg->getS32("Data", "Code", error_code);
+ msg->getS32Fast(_PREHASH_Data, _PREHASH_Code, error_code);
std::string error_token;
- msg->getString("Data", "Token", error_token);
+ msg->getStringFast(_PREHASH_Data, _PREHASH_Token, error_token);
LLUUID error_id;
- msg->getUUID("Data", "ID", error_id);
+ msg->getUUIDFast(_PREHASH_Data, _PREHASH_ID, error_id);
std::string error_system;
- msg->getString("Data", "System", error_system);
+ msg->getStringFast(_PREHASH_Data, _PREHASH_System, error_system);
std::string error_message;
- msg->getString("Data", "Message", error_message);
+ msg->getStringFast(_PREHASH_Data, _PREHASH_Message, error_message);
LL_WARNS("Messaging") << "Message error from " << msg->getSender() << " - "
<< error_code << " " << error_token << " " << error_id << " \""
@@ -2539,13 +2539,12 @@ bool start_messaging_system(
gMessageSystem->setHandlerFuncFast(_PREHASH_DenyTrustedCircuit,
process_deny_trusted_circuit,
NULL);
- gMessageSystem->setHandlerFunc("Error", LLMessageSystem::processError);
+ gMessageSystem->setHandlerFuncFast(_PREHASH_Error, LLMessageSystem::processError);
// We can hand this to the null_message_callback since it is a
// trusted message, so it will automatically be denied if it isn't
// trusted and ignored if it is -- exactly what we want.
- gMessageSystem->setHandlerFunc(
- "RequestTrustedCircuit",
+ gMessageSystem->setHandlerFuncFast(_PREHASH_RequestTrustedCircuit,
null_message_callback,
NULL);
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 0388dd428b13bfe60575a2511db4f41e0ec34081..9b1dbad1f40d7b2ed255d7cf5d9ee025f776c1c3 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -1036,12 +1036,12 @@ void LLUrlEntryParcel::sendParcelInfoRequest(const LLUUID& parcel_id)
if (sRegionHost.isInvalid() || sDisconnected) return;
LLMessageSystem *msg = gMessageSystem;
- msg->newMessage("ParcelInfoRequest");
+ msg->newMessageFast(_PREHASH_ParcelInfoRequest);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, sAgentID );
- msg->addUUID("SessionID", sSessionID);
- msg->nextBlock("Data");
- msg->addUUID("ParcelID", parcel_id);
+ msg->addUUIDFast(_PREHASH_SessionID, sSessionID);
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addUUIDFast(_PREHASH_ParcelID, parcel_id);
msg->sendReliable(sRegionHost);
}
diff --git a/indra/newview/alavataractions.cpp b/indra/newview/alavataractions.cpp
index 493e3ee82f9135cdba2a5092c91abac4037a1635..9c9d236780350ea875e8da9409061c40532bc7d1 100644
--- a/indra/newview/alavataractions.cpp
+++ b/indra/newview/alavataractions.cpp
@@ -650,13 +650,13 @@ bool ALAvatarActions::handleParcelFreeze(const LLSD& notification, const LLSD& r
const auto& id = it->asUUID();
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("FreezeUser");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID());
- msg->addUUID("SessionID", gAgent.getSessionID());
- msg->nextBlock("Data");
- msg->addUUID("TargetID", id);
- msg->addU32("Flags", flags);
+ msg->newMessageFast(_PREHASH_FreezeUser);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addUUIDFast(_PREHASH_TargetID, id);
+ msg->addU32Fast(_PREHASH_Flags, flags);
gAgent.sendReliableMessage();
}
}
@@ -679,13 +679,13 @@ bool ALAvatarActions::handleParcelEject(const LLSD& notification, const LLSD& re
const auto& id = it->asUUID();
U32 flags = (1 == option && ban_enabled) ? 0x1 : 0x0;
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("EjectUser");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID());
- msg->addUUID("SessionID", gAgent.getSessionID());
- msg->nextBlock("Data");
- msg->addUUID("TargetID", id);
- msg->addU32("Flags", flags);
+ msg->newMessageFast(_PREHASH_EjectUser);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addUUIDFast(_PREHASH_TargetID, id);
+ msg->addU32Fast(_PREHASH_Flags, flags);
gAgent.sendReliableMessage();
}
return false;
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index e220928ae097c1576e47d477fce2db20ab644818..b5ab25cb1506b5e37da71980e6a036c0e6b5494f 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -3155,13 +3155,13 @@ BOOL LLAgent::setGroupContribution(const LLUUID& group_id, S32 contribution)
{
mGroups[i].mContribution = contribution;
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("SetGroupContribution");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgentID);
- msg->addUUID("SessionID", gAgentSessionID);
- msg->nextBlock("Data");
- msg->addUUID("GroupID", group_id);
- msg->addS32("Contribution", contribution);
+ msg->newMessageFast(_PREHASH_SetGroupContribution);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgentID);
+ msg->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addUUIDFast(_PREHASH_GroupID, group_id);
+ msg->addS32Fast(_PREHASH_Contribution, contribution);
sendReliableMessage();
return TRUE;
}
@@ -3179,15 +3179,15 @@ BOOL LLAgent::setUserGroupFlags(const LLUUID& group_id, BOOL accept_notices, BOO
mGroups[i].mAcceptNotices = accept_notices;
mGroups[i].mListInProfile = list_in_profile;
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("SetGroupAcceptNotices");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgentID);
- msg->addUUID("SessionID", gAgentSessionID);
- msg->nextBlock("Data");
- msg->addUUID("GroupID", group_id);
- msg->addBOOL("AcceptNotices", accept_notices);
- msg->nextBlock("NewData");
- msg->addBOOL("ListInProfile", list_in_profile);
+ msg->newMessageFast(_PREHASH_SetGroupAcceptNotices);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgentID);
+ msg->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addUUIDFast(_PREHASH_GroupID, group_id);
+ msg->addBOOLFast(_PREHASH_AcceptNotices, accept_notices);
+ msg->nextBlockFast(_PREHASH_NewData);
+ msg->addBOOLFast(_PREHASH_ListInProfile, list_in_profile);
sendReliableMessage();
return TRUE;
}
@@ -3780,8 +3780,8 @@ void LLAgent::processAgentDataUpdate(LLMessageSystem *msg, void **)
if(active_id.notNull())
{
gAgent.mGroupID = active_id;
- msg->getU64(_PREHASH_AgentData, "GroupPowers", gAgent.mGroupPowers);
- msg->getString(_PREHASH_AgentData, _PREHASH_GroupName, gAgent.mGroupName);
+ msg->getU64Fast(_PREHASH_AgentData, _PREHASH_GroupPowers, gAgent.mGroupPowers);
+ msg->getStringFast(_PREHASH_AgentData, _PREHASH_GroupName, gAgent.mGroupName);
}
else
{
@@ -4320,19 +4320,19 @@ void LLAgent::teleportRequest(const U64& region_handle, const LLVector3& pos_loc
LL_INFOS("Teleport") << "Sending TeleportLocationRequest: '" << region_handle << "':"
<< pos_local << LL_ENDL;
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("TeleportLocationRequest");
+ msg->newMessageFast(_PREHASH_TeleportLocationRequest);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, getID());
msg->addUUIDFast(_PREHASH_SessionID, getSessionID());
msg->nextBlockFast(_PREHASH_Info);
- msg->addU64("RegionHandle", region_handle);
- msg->addVector3("Position", pos_local);
+ msg->addU64Fast(_PREHASH_RegionHandle, region_handle);
+ msg->addVector3Fast(_PREHASH_Position, pos_local);
// LLVector3 look_at(0,1,0);
// if (look_at_from_camera)
// {
// look_at = LLViewerCamera::getInstance()->getAtAxis();
// }
- msg->addVector3("LookAt", look_at);
+ msg->addVector3Fast(_PREHASH_LookAt, look_at);
sendReliableMessage();
}
}
@@ -4411,7 +4411,7 @@ void LLAgent::doTeleportViaLure(const LLUUID& lure_id, BOOL godlike)
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);
+ msg->addU32Fast(_PREHASH_TeleportFlags, teleport_flags);
sendReliableMessage();
}
}
@@ -4429,7 +4429,7 @@ void LLAgent::teleportCancel()
// send the message
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("TeleportCancel");
+ msg->newMessageFast(_PREHASH_TeleportCancel);
msg->nextBlockFast(_PREHASH_Info);
msg->addUUIDFast(_PREHASH_AgentID, getID());
msg->addUUIDFast(_PREHASH_SessionID, getSessionID());
@@ -4929,7 +4929,7 @@ void LLAgent::sendAgentUpdateUserInfoMessage(bool im_via_email, const std::strin
gMessageSystem->addUUIDFast(_PREHASH_SessionID, getSessionID());
gMessageSystem->nextBlockFast(_PREHASH_UserData);
gMessageSystem->addBOOLFast(_PREHASH_IMViaEMail, im_via_email);
- gMessageSystem->addString("DirectoryVisibility", directory_visibility);
+ gMessageSystem->addStringFast(_PREHASH_DirectoryVisibility, directory_visibility);
gAgent.sendReliableMessage();
}
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 8544f50555faff1ea4b397aabfb502ad68b78691..6e96d1bf52559ccb67620294247ff240ec6a95ef 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1457,7 +1457,7 @@ void LLAgentWearables::userRemoveMultipleAttachments(llvo_vec_t& objects_to_remo
return;
LL_DEBUGS("Avatar") << "ATT [ObjectDetach] removing " << objects_to_remove.size() << " objects" << LL_ENDL;
- gMessageSystem->newMessage("ObjectDetach");
+ gMessageSystem->newMessageFast(_PREHASH_ObjectDetach);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index df0ad2b8a7cba056827146570c37af4d606ce805..d5f1bdaa54815de7f5361e6f73b6ee0fcd397f4b 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -296,12 +296,12 @@ void LLAvatarTracker::terminateBuddy(const LLUUID& id)
if(!buddy) return;
mBuddyInfo.erase(id);
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("TerminateFriendship");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID());
- msg->addUUID("SessionID", gAgent.getSessionID());
- msg->nextBlock("ExBlock");
- msg->addUUID("OtherID", id);
+ msg->newMessageFast(_PREHASH_TerminateFriendship);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_ExBlock);
+ msg->addUUIDFast(_PREHASH_OtherID, id);
gAgent.sendReliableMessage();
addChangedMask(LLFriendObserver::REMOVE, id);
@@ -781,7 +781,7 @@ void LLAvatarTracker::formFriendship(const LLUUID& id)
void LLAvatarTracker::processTerminateFriendship(LLMessageSystem* msg, void**)
{
LLUUID id;
- msg->getUUID("ExBlock", "OtherID", id);
+ msg->getUUIDFast(_PREHASH_ExBlock, _PREHASH_OtherID, id);
if(id.notNull())
{
LLAvatarTracker& at = LLAvatarTracker::instance();
diff --git a/indra/newview/llestateinfomodel.cpp b/indra/newview/llestateinfomodel.cpp
index 4fdb86059286b13d4b12ec5fc665182b40b0dd4d..227998f61d28e8c90aa68e66609e18ecaad36228 100644
--- a/indra/newview/llestateinfomodel.cpp
+++ b/indra/newview/llestateinfomodel.cpp
@@ -189,24 +189,24 @@ void LLEstateInfoModel::commitEstateInfoDataserver()
LL_DEBUGS() << getInfoDump() << LL_ENDL;
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("EstateOwnerMessage");
+ msg->newMessageFast(_PREHASH_EstateOwnerMessage);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
- msg->nextBlock("MethodData");
- msg->addString("Method", "estatechangeinfo");
- msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
+ msg->nextBlockFast(_PREHASH_MethodData);
+ msg->addStringFast(_PREHASH_Method, "estatechangeinfo");
+ msg->addUUIDFast(_PREHASH_Invoice, LLFloaterRegionInfo::getLastInvoice());
- msg->nextBlock("ParamList");
- msg->addString("Parameter", getName());
+ msg->nextBlockFast(_PREHASH_ParamList);
+ msg->addStringFast(_PREHASH_Parameter, getName());
- msg->nextBlock("ParamList");
- msg->addString("Parameter", llformat("%u", getFlags()));
+ msg->nextBlockFast(_PREHASH_ParamList);
+ msg->addStringFast(_PREHASH_Parameter, llformat("%u", getFlags()));
- msg->nextBlock("ParamList");
- msg->addString("Parameter", llformat("%d", (S32) (getSunHour() * 1024.0f)));
+ msg->nextBlockFast(_PREHASH_ParamList);
+ msg->addStringFast(_PREHASH_Parameter, llformat("%d", (S32) (getSunHour() * 1024.0f)));
gAgent.sendMessage();
}
diff --git a/indra/newview/lleventnotifier.cpp b/indra/newview/lleventnotifier.cpp
index e3c17f98777a0396f3595c9ae09e7c5388421208..5b9955da849c71a65924db7253f0c3ec57820d00 100644
--- a/indra/newview/lleventnotifier.cpp
+++ b/indra/newview/lleventnotifier.cpp
@@ -203,10 +203,10 @@ void LLEventNotifier::processEventInfoReply(LLMessageSystem *msg, void **)
U32 event_time_utc;
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
- msg->getU32("EventData", "EventID", event_id);
- msg->getString("EventData", "Name", event_name);
- msg->getString("EventData", "Date", eventd_date);
- msg->getU32("EventData", "DateUTC", event_time_utc);
+ msg->getU32Fast(_PREHASH_EventData, _PREHASH_EventID, event_id);
+ msg->getStringFast(_PREHASH_EventData, _PREHASH_Name, event_name);
+ msg->getStringFast(_PREHASH_EventData, _PREHASH_Date, eventd_date);
+ msg->getU32Fast(_PREHASH_EventData, _PREHASH_DateUTC, event_time_utc);
gEventNotifier.add(event_id, (F64)event_time_utc, eventd_date, event_name);
}
@@ -252,12 +252,12 @@ void LLEventNotifier::remove(const U32 event_id)
void LLEventNotifier::serverPushRequest(U32 event_id, bool add)
{
// Push up a message to tell the server we have this notification.
- gMessageSystem->newMessage(add?"EventNotificationAddRequest":"EventNotificationRemoveRequest");
+ gMessageSystem->newMessageFast(add ? _PREHASH_EventNotificationAddRequest : _PREHASH_EventNotificationRemoveRequest);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
- gMessageSystem->nextBlock("EventData");
- gMessageSystem->addU32("EventID", event_id);
+ gMessageSystem->nextBlockFast(_PREHASH_EventData);
+ gMessageSystem->addU32Fast(_PREHASH_EventID, event_id);
gAgent.sendReliableMessage();
}
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp
index 80d7f4d59da26af669106058d949c332d2147645..8b80bf8ca9697a220d29af9aa080e63a2fd5e69f 100644
--- a/indra/newview/llfloaterauction.cpp
+++ b/indra/newview/llfloaterauction.cpp
@@ -418,7 +418,7 @@ void LLFloaterAuction::clearParcelAccessList(LLParcel* parcel, LLViewerRegion* r
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID() );
msg->nextBlockFast(_PREHASH_Data);
msg->addU32Fast(_PREHASH_Flags, list);
- msg->addS32(_PREHASH_LocalID, parcel->getLocalID() );
+ msg->addS32Fast(_PREHASH_LocalID, parcel->getLocalID() );
msg->addUUIDFast(_PREHASH_TransactionID, transactionUUID);
msg->addS32Fast(_PREHASH_SequenceID, 1); // sequence_id
msg->addS32Fast(_PREHASH_Sections, 0); // num_sections
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index 417da48519a1c9e4e946d67f59275a1aaa43cf92..9415ccea1f51427dcbe4b7b5689d6e5d8b5475cb 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -507,13 +507,13 @@ void LLFloaterAvatarPicker::find()
else
{
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("AvatarPickerRequest");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID());
- msg->addUUID("SessionID", gAgent.getSessionID());
- msg->addUUID("QueryID", mQueryID); // not used right now
- msg->nextBlock("Data");
- msg->addString("Name", text);
+ msg->newMessageFast(_PREHASH_AvatarPickerRequest);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->addUUIDFast(_PREHASH_QueryID, mQueryID); // not used right now
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addStringFast(_PREHASH_Name, text);
gAgent.sendReliableMessage();
}
}
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp
index cb219be340b7f3c17e685ae54b9b03dc2a7786a6..3e573c60844dc92b24d30ff382a4ab205d1d5eea 100644
--- a/indra/newview/llfloaterbuyland.cpp
+++ b/indra/newview/llfloaterbuyland.cpp
@@ -567,7 +567,7 @@ void LLFloaterBuyLandUI::updateCovenantInfo()
// send EstateCovenantInfo message
LLMessageSystem *msg = gMessageSystem;
- msg->newMessage("EstateCovenantRequest");
+ msg->newMessageFast(_PREHASH_EstateCovenantRequest);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 5e81eaf85232c1b272571e8786ce88b234bf2356..2fff0463e24a0c26cdead52d69786aac1a5c2e10 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -941,21 +941,21 @@ void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channe
msg->nextBlockFast(_PREHASH_ChatData);
msg->addStringFast(_PREHASH_Message, utf8_out_text);
msg->addU8Fast(_PREHASH_Type, type);
- msg->addS32("Channel", channel);
+ msg->addS32Fast(_PREHASH_Channel, channel);
}
else
{
// Hack: ChatFromViewer doesn't allow negative channels
- msg->newMessage("ScriptDialogReply");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgentID);
- msg->addUUID("SessionID", gAgentSessionID);
- msg->nextBlock("Data");
- msg->addUUID("ObjectID", gAgentID);
- msg->addS32("ChatChannel", channel);
- msg->addS32("ButtonIndex", 0);
- msg->addString("ButtonLabel", utf8_out_text);
+ msg->newMessageFast(_PREHASH_ScriptDialogReply);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgentID);
+ msg->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addUUIDFast(_PREHASH_ObjectID, gAgentID);
+ msg->addS32Fast(_PREHASH_ChatChannel, channel);
+ msg->addS32Fast(_PREHASH_ButtonIndex, 0);
+ msg->addStringFast(_PREHASH_ButtonLabel, utf8_out_text);
}
gAgent.sendReliableMessage();
diff --git a/indra/newview/llfloaterlandholdings.cpp b/indra/newview/llfloaterlandholdings.cpp
index 749a3d26862f9c9c1cbdc4e8fde28f2c6bf006b3..3720e6070c2d610389463f2b2510c7aa0662e8d2 100644
--- a/indra/newview/llfloaterlandholdings.cpp
+++ b/indra/newview/llfloaterlandholdings.cpp
@@ -151,7 +151,7 @@ void LLFloaterLandHoldings::refresh()
void LLFloaterLandHoldings::processPlacesReply(LLMessageSystem* msg, void**)
{
LLFloaterLandHoldings* self = LLFloaterReg::findTypedInstance<LLFloaterLandHoldings>("land_holdings");
- S32 count = msg->getNumberOfBlocks("QueryData");
+ S32 count = msg->getNumberOfBlocksFast(_PREHASH_QueryData);
std::string land_sku;
sHasLindenHome = false;
if (!self)
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index df225f09621eb7b2a854b9e23966007b79c510af..3eb903397a608a41f54b3f72dbbda5f1a5f73c7e 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -826,17 +826,17 @@ void LLFloaterReporter::sendReportViaLegacy(const LLSD & report)
msg->nextBlockFast(_PREHASH_ReportData);
msg->addU8Fast(_PREHASH_ReportType, report["report-type"].asInteger());
- msg->addU8(_PREHASH_Category, report["category"].asInteger());
+ msg->addU8Fast(_PREHASH_Category, report["category"].asInteger());
msg->addVector3Fast(_PREHASH_Position, LLVector3(report["position"]));
msg->addU8Fast(_PREHASH_CheckFlags, report["check-flags"].asInteger());
msg->addUUIDFast(_PREHASH_ScreenshotID, report["screenshot-id"].asUUID());
msg->addUUIDFast(_PREHASH_ObjectID, report["object-id"].asUUID());
- msg->addUUID("AbuserID", report["abuser-id"].asUUID());
- msg->addString("AbuseRegionName", report["abuse-region-name"].asString());
- msg->addUUID("AbuseRegionID", report["abuse-region-id"].asUUID());
+ msg->addUUIDFast(_PREHASH_AbuserID, report["abuser-id"].asUUID());
+ msg->addStringFast(_PREHASH_AbuseRegionName, report["abuse-region-name"].asString());
+ msg->addUUIDFast(_PREHASH_AbuseRegionID, report["abuse-region-id"].asUUID());
msg->addStringFast(_PREHASH_Summary, report["summary"].asString());
- msg->addString("VersionString", report["version-string"]);
+ msg->addStringFast(_PREHASH_VersionString, report["version-string"]);
msg->addStringFast(_PREHASH_Details, report["details"] );
msg->sendReliable(regionp->getHost());
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp
index 943876eb598ff40241aa6f399a381b1c4af65361..a1b77efefafd99bb963fd5eb79de67d934f6bbbf 100644
--- a/indra/newview/llgesturemgr.cpp
+++ b/indra/newview/llgesturemgr.cpp
@@ -210,18 +210,18 @@ void LLGestureMgr::activateGestures(LLViewerInventoryItem::item_array_t& items)
if (start_message)
{
- msg->newMessage("ActivateGestures");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID());
- msg->addUUID("SessionID", gAgent.getSessionID());
- msg->addU32("Flags", 0x0);
+ msg->newMessageFast(_PREHASH_ActivateGestures);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->addU32Fast(_PREHASH_Flags, 0x0);
start_message = FALSE;
}
- msg->nextBlock("Data");
- msg->addUUID("ItemID", item->getUUID());
- msg->addUUID("AssetID", item->getAssetUUID());
- msg->addU32("GestureFlags", 0x0);
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addUUIDFast(_PREHASH_ItemID, item->getUUID());
+ msg->addUUIDFast(_PREHASH_AssetID, item->getAssetUUID());
+ msg->addU32Fast(_PREHASH_GestureFlags, 0x0);
if (msg->getCurrentSendTotal() > MTUBYTES)
{
@@ -332,15 +332,15 @@ void LLGestureMgr::deactivateGesture(const LLUUID& item_id)
// Inform the database of this change
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("DeactivateGestures");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID());
- msg->addUUID("SessionID", gAgent.getSessionID());
- msg->addU32("Flags", 0x0);
+ msg->newMessageFast(_PREHASH_DeactivateGestures);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->addU32Fast(_PREHASH_Flags, 0x0);
- msg->nextBlock("Data");
- msg->addUUID("ItemID", item_id);
- msg->addU32("GestureFlags", 0x0);
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addUUIDFast(_PREHASH_ItemID, item_id);
+ msg->addU32Fast(_PREHASH_GestureFlags, 0x0);
gAgent.sendReliableMessage();
@@ -399,17 +399,17 @@ void LLGestureMgr::deactivateSimilarGestures(LLMultiGesture* in, const LLUUID& i
{
if (start_message)
{
- msg->newMessage("DeactivateGestures");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID());
- msg->addUUID("SessionID", gAgent.getSessionID());
- msg->addU32("Flags", 0x0);
+ msg->newMessageFast(_PREHASH_DeactivateGestures);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->addU32Fast(_PREHASH_Flags, 0x0);
start_message = FALSE;
}
- msg->nextBlock("Data");
- msg->addUUID("ItemID", *vit);
- msg->addU32("GestureFlags", 0x0);
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addUUIDFast(_PREHASH_ItemID, *vit);
+ msg->addU32Fast(_PREHASH_GestureFlags, 0x0);
if (msg->getCurrentSendTotal() > MTUBYTES)
{
@@ -1124,16 +1124,16 @@ void LLGestureMgr::onLoadComplete(const LLUUID& asset_uuid,
{
// Inform the database of this change
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("ActivateGestures");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID());
- msg->addUUID("SessionID", gAgent.getSessionID());
- msg->addU32("Flags", 0x0);
-
- msg->nextBlock("Data");
- msg->addUUID("ItemID", item_id);
- msg->addUUID("AssetID", asset_uuid);
- msg->addU32("GestureFlags", 0x0);
+ msg->newMessageFast(_PREHASH_ActivateGestures);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->addU32Fast(_PREHASH_Flags, 0x0);
+
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addUUIDFast(_PREHASH_ItemID, item_id);
+ msg->addUUIDFast(_PREHASH_AssetID, asset_uuid);
+ msg->addU32Fast(_PREHASH_GestureFlags, 0x0);
gAgent.sendReliableMessage();
}
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 348deda09ed6ab1e66601117e9410a79126de757..e16561ec03341f583588f8363e7a7b16af84c6fe 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1610,12 +1610,12 @@ void LLGroupMgr::sendGroupPropertiesRequest(const LLUUID& group_id)
LLGroupMgr::getInstance()->addPendingPropertyRequest(group_id);
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("GroupProfileRequest");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID",gAgent.getID());
- msg->addUUID("SessionID",gAgent.getSessionID());
- msg->nextBlock("GroupData");
- msg->addUUID("GroupID",group_id);
+ msg->newMessageFast(_PREHASH_GroupProfileRequest);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID,gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_GroupData);
+ msg->addUUIDFast(_PREHASH_GroupID,group_id);
gAgent.sendReliableMessage();
}
@@ -1629,13 +1629,13 @@ void LLGroupMgr::sendGroupMembersRequest(const LLUUID& group_id)
group_datap->mMemberRequestID.generate();
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("GroupMembersRequest");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID",gAgent.getID());
- msg->addUUID("SessionID",gAgent.getSessionID());
- msg->nextBlock("GroupData");
- msg->addUUID("GroupID",group_id);
- msg->addUUID("RequestID",group_datap->mMemberRequestID);
+ msg->newMessageFast(_PREHASH_GroupMembersRequest);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID,gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_GroupData);
+ msg->addUUIDFast(_PREHASH_GroupID,group_id);
+ msg->addUUIDFast(_PREHASH_RequestID,group_datap->mMemberRequestID);
gAgent.sendReliableMessage();
}
}
@@ -1651,13 +1651,13 @@ void LLGroupMgr::sendGroupRoleDataRequest(const LLUUID& group_id)
group_datap->mRoleDataRequestID.generate();
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("GroupRoleDataRequest");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID",gAgent.getID());
- msg->addUUID("SessionID",gAgent.getSessionID());
- msg->nextBlock("GroupData");
- msg->addUUID("GroupID",group_id);
- msg->addUUID("RequestID",group_datap->mRoleDataRequestID);
+ msg->newMessageFast(_PREHASH_GroupRoleDataRequest);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID,gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_GroupData);
+ msg->addUUIDFast(_PREHASH_GroupID,group_id);
+ msg->addUUIDFast(_PREHASH_RequestID,group_datap->mRoleDataRequestID);
gAgent.sendReliableMessage();
}
}
@@ -1685,13 +1685,13 @@ void LLGroupMgr::sendGroupRoleMembersRequest(const LLUUID& group_id)
group_datap->mRoleMembersRequestID.generate();
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("GroupRoleMembersRequest");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID",gAgent.getID());
- msg->addUUID("SessionID",gAgent.getSessionID());
- msg->nextBlock("GroupData");
- msg->addUUID("GroupID",group_id);
- msg->addUUID("RequestID",group_datap->mRoleMembersRequestID);
+ msg->newMessageFast(_PREHASH_GroupRoleMembersRequest);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID,gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_GroupData);
+ msg->addUUIDFast(_PREHASH_GroupID,group_id);
+ msg->addUUIDFast(_PREHASH_RequestID,group_datap->mRoleMembersRequestID);
gAgent.sendReliableMessage();
}
}
@@ -1705,12 +1705,12 @@ void LLGroupMgr::sendGroupTitlesRequest(const LLUUID& group_id)
group_datap->mTitlesRequestID.generate();
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("GroupTitlesRequest");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID",gAgent.getID());
- msg->addUUID("SessionID",gAgent.getSessionID());
- msg->addUUID("GroupID",group_id);
- msg->addUUID("RequestID",group_datap->mTitlesRequestID);
+ msg->newMessageFast(_PREHASH_GroupTitlesRequest);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID,gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
+ msg->addUUIDFast(_PREHASH_GroupID,group_id);
+ msg->addUUIDFast(_PREHASH_RequestID,group_datap->mTitlesRequestID);
gAgent.sendReliableMessage();
}
@@ -1720,12 +1720,12 @@ void LLGroupMgr::sendGroupTitleUpdate(const LLUUID& group_id, const LLUUID& titl
LL_DEBUGS("GrpMgr") << "LLGroupMgr::sendGroupTitleUpdate" << LL_ENDL;
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("GroupTitleUpdate");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID",gAgent.getID());
- msg->addUUID("SessionID",gAgent.getSessionID());
- msg->addUUID("GroupID",group_id);
- msg->addUUID("TitleRoleID",title_role_id);
+ msg->newMessageFast(_PREHASH_GroupTitleUpdate);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID,gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
+ msg->addUUIDFast(_PREHASH_GroupID,group_id);
+ msg->addUUIDFast(_PREHASH_TitleRoleID,title_role_id);
gAgent.sendReliableMessage();
@@ -1889,7 +1889,7 @@ void LLGroupMgr::sendGroupMemberInvites(const LLUUID& group_id, std::map<LLUUID,
msg->addUUID("InviteeID",(*it).first);
msg->addUUID("RoleID",(*it).second);
- if (msg->isSendFull())
+ if (msg->isSendFullFast())
{
gAgent.sendReliableMessage();
start_message = true;
@@ -1927,19 +1927,19 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
// Add them to the message
if (start_message)
{
- msg->newMessage("EjectGroupMemberRequest");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID",gAgent.getID());
- msg->addUUID("SessionID",gAgent.getSessionID());
- msg->nextBlock("GroupData");
- msg->addUUID("GroupID",group_id);
+ msg->newMessageFast(_PREHASH_EjectGroupMemberRequest);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID,gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_GroupData);
+ msg->addUUIDFast(_PREHASH_GroupID,group_id);
start_message = false;
}
- msg->nextBlock("EjectData");
- msg->addUUID("EjecteeID",ejected_member_id);
+ msg->nextBlockFast(_PREHASH_EjectData);
+ msg->addUUIDFast(_PREHASH_EjecteeID,ejected_member_id);
- if (msg->isSendFull())
+ if (msg->isSendFullFast())
{
gAgent.sendReliableMessage();
start_message = true;
diff --git a/indra/newview/llhudeffect.cpp b/indra/newview/llhudeffect.cpp
index eff5587610f9deb8ae3cfa9587e7ae221039d588..72572ddb3284b91403824a87921e71e018be7286 100644
--- a/indra/newview/llhudeffect.cpp
+++ b/indra/newview/llhudeffect.cpp
@@ -58,7 +58,7 @@ void LLHUDEffect::packData(LLMessageSystem *mesgsys)
mesgsys->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
mesgsys->addU8Fast(_PREHASH_Type, mType);
mesgsys->addF32Fast(_PREHASH_Duration, mDuration);
- mesgsys->addBinaryData(_PREHASH_Color, mColor.mV, 4);
+ mesgsys->addBinaryDataFast(_PREHASH_Color, mColor.mV, 4);
}
void LLHUDEffect::unpackData(LLMessageSystem *mesgsys, S32 blocknum)
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 73236397abc3d1493973fb4d5fef802c738bfb77..4016d0ca6ecfc74aa91ab304ac220ab718308668 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -516,7 +516,7 @@ void LLInvFVBridge::removeBatchNoCheck(std::vector<LLFolderViewModelItem*>& ba
msg->nextBlockFast(_PREHASH_InventoryData);
msg->addUUIDFast(_PREHASH_ItemID, item->getUUID());
msg->addUUIDFast(_PREHASH_FolderID, trash_id);
- msg->addString("NewName", NULL);
+ msg->addStringFast(_PREHASH_NewName, NULL);
if(msg->isSendFullFast(_PREHASH_InventoryData))
{
start_new_message = true;
@@ -552,7 +552,7 @@ void LLInvFVBridge::removeBatchNoCheck(std::vector<LLFolderViewModelItem*>& ba
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
- msg->addBOOL("Stamp", TRUE);
+ msg->addBOOLFast(_PREHASH_Stamp, TRUE);
}
msg->nextBlockFast(_PREHASH_InventoryData);
msg->addUUIDFast(_PREHASH_FolderID, cat->getUUID());
@@ -1823,7 +1823,7 @@ void LLItemBridge::restoreToWorld()
if (itemp)
{
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("RezRestoreToWorld");
+ msg->newMessageFast(_PREHASH_RezRestoreToWorld);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index f38a36d9e6f16b0e7334bbf78898670d496aaf95..1457ff84f2aeab521bcb8354ac19722a3924b726 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -691,11 +691,11 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
// Create the category on the server. We do this to prevent people
// from munging their protected folders.
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("CreateInventoryFolder");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID());
- msg->addUUID(_PREHASH_SessionID, gAgent.getSessionID());
- msg->nextBlock("FolderData");
+ msg->newMessageFast(_PREHASH_CreateInventoryFolder);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_FolderData);
cat->packMessage(msg);
gAgent.sendReliableMessage();
@@ -2645,8 +2645,8 @@ void LLInventoryModel::buildParentChildMap()
msg->nextBlockFast(_PREHASH_InventoryData);
msg->addUUIDFast(_PREHASH_ItemID, (*it));
msg->addUUIDFast(_PREHASH_FolderID, lnf);
- msg->addString("NewName", NULL);
- if(msg->isSendFull(NULL))
+ msg->addStringFast(_PREHASH_NewName, NULL);
+ if(msg->isSendFullFast(nullptr))
{
start_new_message = TRUE;
gAgent.sendReliableMessage();
@@ -3507,7 +3507,7 @@ void LLInventoryModel::processMoveInventoryItem(LLMessageSystem* msg, void**)
{
LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
msg->getUUIDFast(_PREHASH_InventoryData, _PREHASH_FolderID, folder_id, i);
- msg->getString("InventoryData", "NewName", new_name, i);
+ msg->getStringFast(_PREHASH_InventoryData, _PREHASH_NewName, new_name, i);
LL_DEBUGS() << "moving item " << item_id << " to folder "
<< folder_id << LL_ENDL;
diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp
index 4a8ef53a8ba03be21223eb4dfe777f065068d107..7ffc08483ca0fc36e0247ac5131ac7c8f1701090 100644
--- a/indra/newview/llmutelist.cpp
+++ b/indra/newview/llmutelist.cpp
@@ -367,8 +367,8 @@ void LLMuteList::updateAdd(const LLMute& mute)
msg->nextBlockFast(_PREHASH_MuteData);
msg->addUUIDFast(_PREHASH_MuteID, mute.mID);
msg->addStringFast(_PREHASH_MuteName, mute.mName);
- msg->addS32("MuteType", mute.mType);
- msg->addU32("MuteFlags", mute.mFlags);
+ msg->addS32Fast(_PREHASH_MuteType, mute.mType);
+ msg->addU32Fast(_PREHASH_MuteFlags, mute.mFlags);
gAgent.sendReliableMessage();
if (!mIsLoaded)
@@ -468,7 +468,7 @@ void LLMuteList::updateRemove(const LLMute& mute)
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->nextBlockFast(_PREHASH_MuteData);
msg->addUUIDFast(_PREHASH_MuteID, mute.mID);
- msg->addString("MuteName", mute.mName);
+ msg->addStringFast(_PREHASH_MuteName, mute.mName);
gAgent.sendReliableMessage();
}
diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
index 8a414b5d2a0db61c85759f971fcfc5fe62bf1aae..9279fec6cccf1636934942556cf6956a3384674e 100644
--- a/indra/newview/llpanelgrouplandmoney.cpp
+++ b/indra/newview/llpanelgrouplandmoney.cpp
@@ -839,7 +839,7 @@ BOOL LLPanelGroupLandMoney::isVisibleByAgent(LLAgent* agentp)
void LLPanelGroupLandMoney::processPlacesReply(LLMessageSystem* msg, void**)
{
LLUUID group_id;
- msg->getUUID("AgentData", "QueryID", group_id);
+ msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_QueryID, group_id);
group_id_map_t::iterator found_it = sGroupIDs.find(group_id);
if(found_it == sGroupIDs.end())
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index 24e7d4b67a684d574f02eec0e06f7b439278d6ba..a411e4fe27903a00da2948108731d64161bb5aff 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -474,12 +474,12 @@ void LLPanelGroupNotices::onClickRefreshNotices(void* data)
self->clearNoticeList();
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("GroupNoticesListRequest");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID",gAgent.getID());
- msg->addUUID("SessionID",gAgent.getSessionID());
- msg->nextBlock("Data");
- msg->addUUID("GroupID",self->mGroupID);
+ msg->newMessageFast(_PREHASH_GroupNoticesListRequest);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID,gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addUUIDFast(_PREHASH_GroupID,self->mGroupID);
gAgent.sendReliableMessage();
}
@@ -490,7 +490,7 @@ std::map<LLUUID,LLPanelGroupNotices*> LLPanelGroupNotices::sInstances;
void LLPanelGroupNotices::processGroupNoticesListReply(LLMessageSystem* msg, void** data)
{
LLUUID group_id;
- msg->getUUID("AgentData", "GroupID", group_id);
+ msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_GroupID, group_id);
std::map<LLUUID,LLPanelGroupNotices*>::iterator it = sInstances.find(group_id);
if (it == sInstances.end())
@@ -604,12 +604,12 @@ void LLPanelGroupNotices::onSelectNotice(LLUICtrl* ctrl, void* data)
if (!item) return;
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("GroupNoticeRequest");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID",gAgent.getID());
- msg->addUUID("SessionID",gAgent.getSessionID());
- msg->nextBlock("Data");
- msg->addUUID("GroupNoticeID",item->getUUID());
+ msg->newMessageFast(_PREHASH_GroupNoticeRequest);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID,gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addUUIDFast(_PREHASH_GroupNoticeID,item->getUUID());
gAgent.sendReliableMessage();
LL_DEBUGS() << "Item " << item->getUUID() << " selected." << LL_ENDL;
diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp
index 256529036727f162d652243e8b98001f7e0518c3..b51e89f3f1d68d65550794b8af9372c8d547e54b 100644
--- a/indra/newview/llpanelplaceprofile.cpp
+++ b/indra/newview/llpanelplaceprofile.cpp
@@ -348,7 +348,7 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel,
// Note: LLPanelPlaceProfile doesn't change Covenant's content and any
// changes made by Estate floater should be requested by Estate floater
LLMessageSystem *msg = gMessageSystem;
- msg->newMessage("EstateCovenantRequest");
+ msg->newMessageFast(_PREHASH_EstateCovenantRequest);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
diff --git a/indra/newview/llremoteparcelrequest.cpp b/indra/newview/llremoteparcelrequest.cpp
index 055ccd5818545c40f57c997141be639156cc428a..a4f4fac00fdc1c981554c80828f46c58fd8d21a1 100644
--- a/indra/newview/llremoteparcelrequest.cpp
+++ b/indra/newview/llremoteparcelrequest.cpp
@@ -86,21 +86,21 @@ void LLRemoteParcelInfoProcessor::processParcelInfoReply(LLMessageSystem* msg, v
{
LLParcelData parcel_data;
- msg->getUUID ("Data", "ParcelID", parcel_data.parcel_id);
- msg->getUUID ("Data", "OwnerID", parcel_data.owner_id);
- msg->getString ("Data", "Name", parcel_data.name);
- msg->getString ("Data", "Desc", parcel_data.desc);
- msg->getS32 ("Data", "ActualArea", parcel_data.actual_area);
- msg->getS32 ("Data", "BillableArea", parcel_data.billable_area);
- msg->getU8 ("Data", "Flags", parcel_data.flags);
- msg->getF32 ("Data", "GlobalX", parcel_data.global_x);
- msg->getF32 ("Data", "GlobalY", parcel_data.global_y);
- msg->getF32 ("Data", "GlobalZ", parcel_data.global_z);
- msg->getString ("Data", "SimName", parcel_data.sim_name);
- msg->getUUID ("Data", "SnapshotID", parcel_data.snapshot_id);
- msg->getF32 ("Data", "Dwell", parcel_data.dwell);
- msg->getS32 ("Data", "SalePrice", parcel_data.sale_price);
- msg->getS32 ("Data", "AuctionID", parcel_data.auction_id);
+ msg->getUUIDFast (_PREHASH_Data, _PREHASH_ParcelID, parcel_data.parcel_id);
+ msg->getUUIDFast (_PREHASH_Data, _PREHASH_OwnerID, parcel_data.owner_id);
+ msg->getStringFast (_PREHASH_Data, _PREHASH_Name, parcel_data.name);
+ msg->getStringFast (_PREHASH_Data, _PREHASH_Desc, parcel_data.desc);
+ msg->getS32Fast (_PREHASH_Data, _PREHASH_ActualArea, parcel_data.actual_area);
+ msg->getS32Fast (_PREHASH_Data, _PREHASH_BillableArea, parcel_data.billable_area);
+ msg->getU8Fast (_PREHASH_Data, _PREHASH_Flags, parcel_data.flags);
+ msg->getF32Fast (_PREHASH_Data, _PREHASH_GlobalX, parcel_data.global_x);
+ msg->getF32Fast (_PREHASH_Data, _PREHASH_GlobalY, parcel_data.global_y);
+ msg->getF32Fast (_PREHASH_Data, _PREHASH_GlobalZ, parcel_data.global_z);
+ msg->getStringFast (_PREHASH_Data, _PREHASH_SimName, parcel_data.sim_name);
+ msg->getUUIDFast (_PREHASH_Data, _PREHASH_SnapshotID, parcel_data.snapshot_id);
+ msg->getF32Fast (_PREHASH_Data, _PREHASH_Dwell, parcel_data.dwell);
+ msg->getS32Fast (_PREHASH_Data, _PREHASH_SalePrice, parcel_data.sale_price);
+ msg->getS32Fast (_PREHASH_Data, _PREHASH_AuctionID, parcel_data.auction_id);
LLRemoteParcelInfoProcessor::observer_multimap_t & observers = LLRemoteParcelInfoProcessor::getInstance()->mObservers;
@@ -153,12 +153,12 @@ void LLRemoteParcelInfoProcessor::sendParcelInfoRequest(const LLUUID& parcel_id)
{
LLMessageSystem *msg = gMessageSystem;
- msg->newMessage("ParcelInfoRequest");
+ msg->newMessageFast(_PREHASH_ParcelInfoRequest);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
- msg->addUUID("SessionID", gAgent.getSessionID());
- msg->nextBlock("Data");
- msg->addUUID("ParcelID", parcel_id);
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addUUIDFast(_PREHASH_ParcelID, parcel_id);
gAgent.sendReliableMessage();
}
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index b36582e8ffada12ce386b23b023c985cdd06b006..c2af52e51d8db60b356d195d61b44cb7bddab4da 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -2584,8 +2584,8 @@ void LLSelectMgr::logDetachRequest(LLSelectNode* node, void *)
void LLSelectMgr::packObjectIDAsParam(LLSelectNode* node, void *)
{
std::string buf = llformat("%u", node->getObject()->getLocalID());
- gMessageSystem->nextBlock("ParamList");
- gMessageSystem->addString("Parameter", buf);
+ gMessageSystem->nextBlockFast(_PREHASH_ParamList);
+ gMessageSystem->addStringFast(_PREHASH_Parameter, buf);
}
//-----------------------------------------------------------------------------
@@ -5015,14 +5015,14 @@ void LLSelectMgr::packObjectClickAction(LLSelectNode* node, void *user_data)
{
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, node->getObject()->getLocalID() );
- gMessageSystem->addU8("ClickAction", node->getObject()->getClickAction());
+ gMessageSystem->addU8Fast(_PREHASH_ClickAction, node->getObject()->getClickAction());
}
void LLSelectMgr::packObjectIncludeInSearch(LLSelectNode* node, void *user_data)
{
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, node->getObject()->getLocalID() );
- gMessageSystem->addBOOL("IncludeInSearch", node->getObject()->getIncludeInSearch());
+ gMessageSystem->addBOOLFast(_PREHASH_IncludeInSearch, node->getObject()->getIncludeInSearch());
}
// static
@@ -5244,7 +5244,7 @@ void LLSelectMgr::sendListToRegions(LLObjectSelectionHandle selected_handle,
// if to same simulator and message not too big
if ((current_region == last_region)
- && (! gMessageSystem->isSendFull(NULL))
+ && (! gMessageSystem->isSendFullFast(nullptr))
&& (objects_in_this_packet < MAX_OBJECTS_PER_PACKET))
{
if (link_operation && linkset_root == NULL)
@@ -8015,7 +8015,7 @@ void LLSelectMgr::sendSelectionMove()
}
// prepare first bulk message
- gMessageSystem->newMessage("MultipleObjectUpdate");
+ gMessageSystem->newMessageFast(_PREHASH_MultipleObjectUpdate);
packAgentAndSessionID(&update_type);
LLViewerObject *obj = NULL;
@@ -8029,13 +8029,13 @@ void LLSelectMgr::sendSelectionMove()
// if not simulator or message too big
if (curr_region != last_region
- || gMessageSystem->isSendFull(NULL)
+ || gMessageSystem->isSendFullFast(nullptr)
|| objects_in_this_packet >= MAX_OBJECTS_PER_PACKET)
{
// send sim the current message and start new one
gMessageSystem->sendReliable(last_region->getHost());
objects_in_this_packet = 0;
- gMessageSystem->newMessage("MultipleObjectUpdate");
+ gMessageSystem->newMessageFast(_PREHASH_MultipleObjectUpdate);
packAgentAndSessionID(&update_type);
}
diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp
index 820d76b60926066e8755db217a48ac96cd82a142..c0c267c019234dcfb287392c778e9606fe1bb921 100644
--- a/indra/newview/lltoolbrush.cpp
+++ b/indra/newview/lltoolbrush.cpp
@@ -185,8 +185,8 @@ void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global,
msg->addF32Fast(_PREHASH_South, y_pos );
msg->addF32Fast(_PREHASH_East, x_pos );
msg->addF32Fast(_PREHASH_North, y_pos );
- msg->nextBlock("ModifyBlockExtended");
- msg->addF32("BrushSize", mBrushSize);
+ msg->nextBlockFast(_PREHASH_ModifyBlockExtended);
+ msg->addF32Fast(_PREHASH_BrushSize, mBrushSize);
msg->sendMessage(regionp->getHost());
}
}
@@ -340,8 +340,8 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
msg->addF32Fast(_PREHASH_North, max_region.mV[VY] );
}
- msg->nextBlock("ModifyBlockExtended");
- msg->addF32("BrushSize", mBrushSize);
+ msg->nextBlockFast(_PREHASH_ModifyBlockExtended);
+ msg->addF32Fast(_PREHASH_BrushSize, mBrushSize);
msg->sendMessage(regionp->getHost());
}
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 476480aa8bac0e11ff966a010d24ea067f1151e3..3775b474f33af72176a2448d8d01e46dab2e65fb 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1333,7 +1333,7 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target,
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupForRezzing());
- msg->nextBlock("RezData");
+ msg->nextBlockFast(_PREHASH_RezData);
// if it's being rezzed from task inventory, we need to enable
// saving it back into the task inventory.
// *FIX: We can probably compress this to a single byte, since I
diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp
index ad8d009cc5b148542c48dfb44d0fc4cbfe1c5f98..1bf0c9b07d62c8c6a32c8551c83d8f04cdfcc209 100644
--- a/indra/newview/lltoolgrab.cpp
+++ b/indra/newview/lltoolgrab.cpp
@@ -719,13 +719,13 @@ void LLToolGrabBase::handleHoverActive(S32 x, S32 y, MASK mask)
msg->addVector3Fast(_PREHASH_GrabOffsetInitial, mGrabOffsetFromCenterInitial );
msg->addVector3Fast(_PREHASH_GrabPosition, grab_pos_region );
msg->addU32Fast(_PREHASH_TimeSinceLast, dt_milliseconds );
- msg->nextBlock("SurfaceInfo");
- msg->addVector3("UVCoord", LLVector3(mGrabPick.mUVCoords));
- msg->addVector3("STCoord", LLVector3(mGrabPick.mSTCoords));
+ msg->nextBlockFast(_PREHASH_SurfaceInfo);
+ msg->addVector3Fast(_PREHASH_UVCoord, LLVector3(mGrabPick.mUVCoords));
+ msg->addVector3Fast(_PREHASH_STCoord, LLVector3(mGrabPick.mSTCoords));
msg->addS32Fast(_PREHASH_FaceIndex, mGrabPick.mObjectFace);
- msg->addVector3("Position", mGrabPick.mIntersection);
- msg->addVector3("Normal", mGrabPick.mNormal);
- msg->addVector3("Binormal", mGrabPick.mBinormal);
+ msg->addVector3Fast(_PREHASH_Position, mGrabPick.mIntersection);
+ msg->addVector3Fast(_PREHASH_Normal, mGrabPick.mNormal);
+ msg->addVector3Fast(_PREHASH_Binormal, mGrabPick.mBinormal);
msg->sendMessage( objectp->getRegion()->getHost() );
}
@@ -890,13 +890,13 @@ void LLToolGrabBase::handleHoverNonPhysical(S32 x, S32 y, MASK mask)
msg->addVector3Fast(_PREHASH_GrabOffsetInitial, mGrabOffsetFromCenterInitial );
msg->addVector3Fast(_PREHASH_GrabPosition, grab_pos_region );
msg->addU32Fast(_PREHASH_TimeSinceLast, dt_milliseconds );
- msg->nextBlock("SurfaceInfo");
- msg->addVector3("UVCoord", LLVector3(pick.mUVCoords));
- msg->addVector3("STCoord", LLVector3(pick.mSTCoords));
+ msg->nextBlockFast(_PREHASH_SurfaceInfo);
+ msg->addVector3Fast(_PREHASH_UVCoord, LLVector3(pick.mUVCoords));
+ msg->addVector3Fast(_PREHASH_STCoord, LLVector3(pick.mSTCoords));
msg->addS32Fast(_PREHASH_FaceIndex, pick.mObjectFace);
- msg->addVector3("Position", pick.mIntersection);
- msg->addVector3("Normal", pick.mNormal);
- msg->addVector3("Binormal", pick.mBinormal);
+ msg->addVector3Fast(_PREHASH_Position, pick.mIntersection);
+ msg->addVector3Fast(_PREHASH_Normal, pick.mNormal);
+ msg->addVector3Fast(_PREHASH_Binormal, pick.mBinormal);
msg->sendMessage( objectp->getRegion()->getHost() );
@@ -1172,13 +1172,13 @@ void send_ObjectGrab_message(LLViewerObject* object, const LLPickInfo & pick, co
msg->nextBlockFast( _PREHASH_ObjectData);
msg->addU32Fast( _PREHASH_LocalID, object->mLocalID);
msg->addVector3Fast(_PREHASH_GrabOffset, grab_offset);
- msg->nextBlock("SurfaceInfo");
- msg->addVector3("UVCoord", LLVector3(pick.mUVCoords));
- msg->addVector3("STCoord", LLVector3(pick.mSTCoords));
+ msg->nextBlockFast(_PREHASH_SurfaceInfo);
+ msg->addVector3Fast(_PREHASH_UVCoord, LLVector3(pick.mUVCoords));
+ msg->addVector3Fast(_PREHASH_STCoord, LLVector3(pick.mSTCoords));
msg->addS32Fast(_PREHASH_FaceIndex, pick.mObjectFace);
- msg->addVector3("Position", pick.mIntersection);
- msg->addVector3("Normal", pick.mNormal);
- msg->addVector3("Binormal", pick.mBinormal);
+ msg->addVector3Fast(_PREHASH_Position, pick.mIntersection);
+ msg->addVector3Fast(_PREHASH_Normal, pick.mNormal);
+ msg->addVector3Fast(_PREHASH_Binormal, pick.mBinormal);
msg->sendMessage( object->getRegion()->getHost());
/* Diagnostic code
@@ -1208,13 +1208,13 @@ void send_ObjectDeGrab_message(LLViewerObject* object, const LLPickInfo & pick)
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->nextBlockFast(_PREHASH_ObjectData);
msg->addU32Fast(_PREHASH_LocalID, object->mLocalID);
- msg->nextBlock("SurfaceInfo");
- msg->addVector3("UVCoord", LLVector3(pick.mUVCoords));
- msg->addVector3("STCoord", LLVector3(pick.mSTCoords));
+ msg->nextBlockFast(_PREHASH_SurfaceInfo);
+ msg->addVector3Fast(_PREHASH_UVCoord, LLVector3(pick.mUVCoords));
+ msg->addVector3Fast(_PREHASH_STCoord, LLVector3(pick.mSTCoords));
msg->addS32Fast(_PREHASH_FaceIndex, pick.mObjectFace);
- msg->addVector3("Position", pick.mIntersection);
- msg->addVector3("Normal", pick.mNormal);
- msg->addVector3("Binormal", pick.mBinormal);
+ msg->addVector3Fast(_PREHASH_Position, pick.mIntersection);
+ msg->addVector3Fast(_PREHASH_Normal, pick.mNormal);
+ msg->addVector3Fast(_PREHASH_Binormal, pick.mBinormal);
msg->sendMessage(object->getRegion()->getHost());
}
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp
index 731b537f2a2b33b45c4c24187e9363c7853ff377..7490515c5806d79510edc43317bf12e7cd52f5af 100644
--- a/indra/newview/lltracker.cpp
+++ b/indra/newview/lltracker.cpp
@@ -776,13 +776,13 @@ void LLTracker::setLandmarkVisited()
flags |= LLInventoryItemFlags::II_FLAGS_LANDMARK_VISITED;
item->setFlags(flags);
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("ChangeInventoryItemFlags");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID());
- msg->addUUID("SessionID", gAgent.getSessionID());
- msg->nextBlock("InventoryData");
- msg->addUUID("ItemID", mTrackedLandmarkItemID);
- msg->addU32("Flags", flags);
+ msg->newMessageFast(_PREHASH_ChangeInventoryItemFlags);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_InventoryData);
+ msg->addUUIDFast(_PREHASH_ItemID, mTrackedLandmarkItemID);
+ msg->addU32Fast(_PREHASH_Flags, flags);
gAgent.sendReliableMessage();
LLInventoryModel::LLCategoryUpdate up(item->getParentUUID(), 0);
diff --git a/indra/newview/llviewergenericmessage.cpp b/indra/newview/llviewergenericmessage.cpp
index d3de9d72bfa979b86b9536b8592b122c90ee478f..53f3bf558118cdb74e87e4a30d69d4a649b8e290 100644
--- a/indra/newview/llviewergenericmessage.cpp
+++ b/indra/newview/llviewergenericmessage.cpp
@@ -44,18 +44,18 @@ void send_generic_message(const std::string& method,
const LLUUID& invoice)
{
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("GenericMessage");
+ msg->newMessageFast(_PREHASH_GenericMessage);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
- msg->nextBlock("MethodData");
- msg->addString("Method", method);
- msg->addUUID("Invoice", invoice);
+ msg->nextBlockFast(_PREHASH_MethodData);
+ msg->addStringFast(_PREHASH_Method, method);
+ msg->addUUIDFast(_PREHASH_Invoice, invoice);
if(strings.empty())
{
- msg->nextBlock("ParamList");
- msg->addString("Parameter", NULL);
+ msg->nextBlockFast(_PREHASH_ParamList);
+ msg->addStringFast(_PREHASH_Parameter, NULL);
}
else
{
@@ -63,8 +63,8 @@ void send_generic_message(const std::string& method,
std::vector<std::string>::const_iterator end = strings.end();
for(; it != end; ++it)
{
- msg->nextBlock("ParamList");
- msg->addString("Parameter", *it);
+ msg->nextBlockFast(_PREHASH_ParamList);
+ msg->addStringFast(_PREHASH_Parameter, *it);
}
}
gAgent.sendReliableMessage();
@@ -73,7 +73,7 @@ void send_generic_message(const std::string& method,
void process_generic_message(LLMessageSystem* msg, void**)
{
LLUUID agent_id;
- msg->getUUID("AgentData", "AgentID", agent_id);
+ msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
if (agent_id != gAgent.getID())
{
LL_WARNS() << "GenericMessage for wrong agent" << LL_ENDL;
@@ -95,7 +95,7 @@ void process_generic_message(LLMessageSystem* msg, void**)
void process_large_generic_message(LLMessageSystem* msg, void**)
{
LLUUID agent_id;
- msg->getUUID("AgentData", "AgentID", agent_id);
+ msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
if (agent_id != gAgent.getID())
{
LL_WARNS() << "GenericMessage for wrong agent" << LL_ENDL;
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 34661fad61655505ad19b9933b859c9124fdc8a5..a328a77c366309a4ab5c765eb24acbb69a14e289 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -488,13 +488,13 @@ void LLViewerInventoryItem::fetchFromServer(void) const
else
{
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("FetchInventory");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID());
- msg->addUUID("SessionID", gAgent.getSessionID());
- msg->nextBlock("InventoryData");
- msg->addUUID("OwnerID", mPermissions.getOwner());
- msg->addUUID("ItemID", mUUID);
+ msg->newMessageFast(_PREHASH_FetchInventory);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_InventoryData);
+ msg->addUUIDFast(_PREHASH_OwnerID, mPermissions.getOwner());
+ msg->addUUIDFast(_PREHASH_ItemID, mUUID);
gAgent.sendReliableMessage();
}
}
@@ -565,7 +565,7 @@ void LLViewerInventoryItem::updateParentOnServer(BOOL restamp) const
msg->nextBlockFast(_PREHASH_InventoryData);
msg->addUUIDFast(_PREHASH_ItemID, mUUID);
msg->addUUIDFast(_PREHASH_FolderID, mParentUUID);
- msg->addString("NewName", NULL);
+ msg->addStringFast(_PREHASH_NewName, NULL);
gAgent.sendReliableMessage();
}
@@ -640,7 +640,7 @@ void LLViewerInventoryCategory::updateParentOnServer(BOOL restamp) const
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
- msg->addBOOL("Stamp", restamp);
+ msg->addBOOLFast(_PREHASH_Stamp, restamp);
msg->nextBlockFast(_PREHASH_InventoryData);
msg->addUUIDFast(_PREHASH_FolderID, mUUID);
msg->addUUIDFast(_PREHASH_ParentID, mParentUUID);
@@ -1056,10 +1056,10 @@ void create_inventory_item(const LLUUID& agent_id, const LLUUID& session_id,
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_CreateInventoryItem);
- msg->nextBlock(_PREHASH_AgentData);
+ msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, agent_id);
msg->addUUIDFast(_PREHASH_SessionID, session_id);
- msg->nextBlock(_PREHASH_InventoryBlock);
+ msg->nextBlockFast(_PREHASH_InventoryBlock);
msg->addU32Fast(_PREHASH_CallbackID, gInventoryCallbacks.registerCB(cb));
msg->addUUIDFast(_PREHASH_FolderID, parent);
msg->addUUIDFast(_PREHASH_TransactionID, transaction_id);
@@ -1533,12 +1533,12 @@ void purge_descendents_of(const LLUUID& id, LLPointer<LLInventoryCallback> cb)
// send it upstream
LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("PurgeInventoryDescendents");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID());
- msg->addUUID("SessionID", gAgent.getSessionID());
- msg->nextBlock("InventoryData");
- msg->addUUID("FolderID", id);
+ msg->newMessageFast(_PREHASH_PurgeInventoryDescendents);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_InventoryData);
+ msg->addUUIDFast(_PREHASH_FolderID, id);
gAgent.sendReliableMessage();
// Update model immediately because there is no callback mechanism.
diff --git a/indra/newview/llviewerjointattachment.cpp b/indra/newview/llviewerjointattachment.cpp
index cdb49ce07dfb6faa15a4c760b7d55c5892dcc9d4..1054f110e8562a510477a61bf87617ec414c97b6 100644
--- a/indra/newview/llviewerjointattachment.cpp
+++ b/indra/newview/llviewerjointattachment.cpp
@@ -200,7 +200,7 @@ BOOL LLViewerJointAttachment::addObject(LLViewerObject* object)
pAttachObj->markDead();
if (pAttachObj->permYouOwner())
{
- gMessageSystem->newMessage("ObjectDetach");
+ gMessageSystem->newMessageFast(_PREHASH_ObjectDetach);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index df159eb345ab584279d16e85d1d8177dc0580f4d..54ad948de03ea5dc2eb6e0684e3c633d0e9e71f7 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -849,7 +849,7 @@ void upload_done_callback(
msg->nextBlockFast(_PREHASH_MoneyData);
msg->addUUIDFast(_PREHASH_SourceID, gAgent.getID());
msg->addUUIDFast(_PREHASH_DestID, LLUUID::null);
- msg->addU8("Flags", 0);
+ msg->addU8Fast(_PREHASH_Flags, 0);
// we tell the sim how much we were expecting to pay so it
// can respond to any discrepancy
msg->addS32Fast(_PREHASH_Amount, expected_upload_cost);
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b34d5cced29e4a271f3817ed5edc3b32e8aaa78f..225c5f8b0006855ebf19a8f5821ba0fdbec96fc6 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -436,9 +436,9 @@ void process_logout_reply(LLMessageSystem* msg, void**)
LL_DEBUGS("Messaging") << "process_logout_reply" << LL_ENDL;
LLUUID agent_id;
- msg->getUUID("AgentData", "AgentID", agent_id);
+ msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
LLUUID session_id;
- msg->getUUID("AgentData", "SessionID", session_id);
+ msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_SessionID, session_id);
if((agent_id != gAgent.getID()) || (session_id != gAgent.getSessionID()))
{
LL_WARNS("Messaging") << "Bogus Logout Reply" << LL_ENDL;
@@ -2349,7 +2349,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
msg->getU8Fast(_PREHASH_MessageBlock, _PREHASH_Dialog, d);
msg->getUUIDFast(_PREHASH_MessageBlock, _PREHASH_ID, session_id);
msg->getU32Fast(_PREHASH_MessageBlock, _PREHASH_Timestamp, timestamp);
- //msg->getData("MessageBlock", "Count", &count);
+ //msg->getDataFast(_PREHASH_MessageBlock, _PREHASH_Count, &count);
msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_FromAgentName, agentName);
msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_Message, message);
msg->getU32Fast(_PREHASH_MessageBlock, _PREHASH_ParentEstateID, parent_estate_id);
@@ -2535,18 +2535,18 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
LLUUID owner_id;
LLViewerObject* chatter;
- msg->getString("ChatData", "FromName", from_name);
+ msg->getStringFast(_PREHASH_ChatData, _PREHASH_FromName, from_name);
- msg->getUUID("ChatData", "SourceID", from_id);
+ msg->getUUIDFast(_PREHASH_ChatData, _PREHASH_SourceID, from_id);
chat.mFromID = from_id;
// Object owner for objects
- msg->getUUID("ChatData", "OwnerID", owner_id);
+ msg->getUUIDFast(_PREHASH_ChatData, _PREHASH_OwnerID, owner_id);
msg->getU8Fast(_PREHASH_ChatData, _PREHASH_SourceType, source_temp);
chat.mSourceType = (EChatSourceType)source_temp;
- msg->getU8("ChatData", "ChatType", type_temp);
+ msg->getU8Fast(_PREHASH_ChatData, _PREHASH_ChatType, type_temp);
chat.mChatType = (EChatType)type_temp;
msg->getU8Fast(_PREHASH_ChatData, _PREHASH_Audible, audible_temp);
@@ -2966,7 +2966,7 @@ void process_teleport_start(LLMessageSystem *msg, void**)
// on teleport, don't tell them about destination guide anymore
LLFirstUse::notUsingDestinationGuide(false);
U32 teleport_flags = 0x0;
- msg->getU32("Info", "TeleportFlags", teleport_flags);
+ msg->getU32Fast(_PREHASH_Info, _PREHASH_TeleportFlags, teleport_flags);
if (gAgent.getTeleportState() == LLAgent::TELEPORT_MOVING)
{
@@ -3015,7 +3015,7 @@ boost::signals2::connection LLViewerMessage::setTeleportStartedCallback(teleport
void process_teleport_progress(LLMessageSystem* msg, void**)
{
LLUUID agent_id;
- msg->getUUID("AgentData", "AgentID", agent_id);
+ msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
if((gAgent.getID() != agent_id)
|| (gAgent.getTeleportState() == LLAgent::TELEPORT_NONE))
{
@@ -3023,7 +3023,7 @@ void process_teleport_progress(LLMessageSystem* msg, void**)
return;
}
U32 teleport_flags = 0x0;
- msg->getU32("Info", "TeleportFlags", teleport_flags);
+ msg->getU32Fast(_PREHASH_Info, _PREHASH_TeleportFlags, teleport_flags);
// if (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL)
// [RLVa:KB] - Checked: 2010-04-07 (RLVa-1.2.0d) | Added: RLVa-0.2.0b
if ( (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL) || (!gRlvHandler.getCanCancelTp()) )
@@ -3036,7 +3036,7 @@ void process_teleport_progress(LLMessageSystem* msg, void**)
gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Cancel"));
}
std::string buffer;
- msg->getString("Info", "Message", buffer);
+ msg->getStringFast(_PREHASH_Info, _PREHASH_Message, buffer);
LL_DEBUGS("Messaging") << "teleport progress: " << buffer << " flags: " << teleport_flags << LL_ENDL;
//Sorta hacky...default to using simulator raw messages
@@ -3341,7 +3341,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
msg->getU64Fast(_PREHASH_Data, _PREHASH_RegionHandle, region_handle);
std::string version_channel;
- msg->getString("SimData", "ChannelVersion", version_channel);
+ msg->getStringFast(_PREHASH_SimData, _PREHASH_ChannelVersion, version_channel);
if (!isAgentAvatarValid())
{
@@ -4619,11 +4619,11 @@ void process_set_follow_cam_properties(LLMessageSystem *mesgsys, void **user_dat
objectp->setFlagsWithoutUpdate(FLAGS_CAMERA_SOURCE, TRUE);
}
- S32 num_objects = mesgsys->getNumberOfBlocks("CameraProperty");
+ S32 num_objects = mesgsys->getNumberOfBlocksFast(_PREHASH_CameraProperty);
for (S32 block_index = 0; block_index < num_objects; block_index++)
{
- mesgsys->getS32("CameraProperty", "Type", type, block_index);
- mesgsys->getF32("CameraProperty", "Value", value, block_index);
+ mesgsys->getS32Fast(_PREHASH_CameraProperty, _PREHASH_Type, type, block_index);
+ mesgsys->getF32Fast(_PREHASH_CameraProperty, _PREHASH_Value, value, block_index);
switch(type)
{
case FOLLOWCAM_PITCH:
@@ -4842,10 +4842,10 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
std::string desc;
LLUUID tid;
- msg->getUUID("MoneyData", "TransactionID", tid);
- msg->getS32("MoneyData", "MoneyBalance", balance);
- msg->getS32("MoneyData", "SquareMetersCredit", credit);
- msg->getS32("MoneyData", "SquareMetersCommitted", committed);
+ msg->getUUIDFast(_PREHASH_MoneyData, _PREHASH_TransactionID, tid);
+ msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_MoneyBalance, balance);
+ msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_SquareMetersCredit, credit);
+ msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_SquareMetersCommitted, committed);
msg->getStringFast(_PREHASH_MoneyData, _PREHASH_Description, desc);
LL_INFOS("Messaging") << "L$, credit, committed: " << balance << " " << credit << " "
<< committed << LL_ENDL;
@@ -5764,7 +5764,7 @@ void process_mean_collision_alert_message(LLMessageSystem *msgsystem, void **use
EMeanCollisionType type;
F32 mag;
- S32 i, num = msgsystem->getNumberOfBlocks(_PREHASH_MeanCollision);
+ S32 i, num = msgsystem->getNumberOfBlocksFast(_PREHASH_MeanCollision);
for (i = 0; i < num; i++)
{
@@ -6107,7 +6107,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
msg->getStringFast(_PREHASH_Data, _PREHASH_ObjectOwner, owner_name);
msg->getS32Fast(_PREHASH_Data, _PREHASH_Questions, questions );
- if(msg->has(_PREHASH_Experience))
+ if(msg->hasFast(_PREHASH_Experience))
{
msg->getUUIDFast(_PREHASH_Experience, _PREHASH_ExperienceID, experienceid);
}
@@ -6881,7 +6881,7 @@ void process_user_info_reply(LLMessageSystem* msg, void**)
std::string email;
msg->getStringFast(_PREHASH_UserData, _PREHASH_EMail, email);
std::string dir_visibility;
- msg->getString( "UserData", "DirectoryVisibility", dir_visibility);
+ msg->getStringFast(_PREHASH_UserData, _PREHASH_DirectoryVisibility, dir_visibility);
// For Message based user info information the is_verified is assumed to be false.
LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email, false);
@@ -6972,13 +6972,13 @@ void process_script_dialog(LLMessageSystem* msg, void**)
LLSD payload;
LLUUID object_id;
- msg->getUUID("Data", "ObjectID", object_id);
+ msg->getUUIDFast(_PREHASH_Data, _PREHASH_ObjectID, object_id);
// For compability with OS grids first check for presence of extended packet before fetching data.
LLUUID owner_id;
- if (gMessageSystem->getNumberOfBlocks("OwnerData") > 0)
+ if (gMessageSystem->getNumberOfBlocksFast(_PREHASH_OwnerData) > 0)
{
- msg->getUUID("OwnerData", "OwnerID", owner_id);
+ msg->getUUIDFast(_PREHASH_OwnerData, _PREHASH_OwnerID, owner_id);
}
if (LLMuteList::getInstance()->isMuted(object_id) || LLMuteList::getInstance()->isMuted(owner_id))
@@ -6992,15 +6992,15 @@ void process_script_dialog(LLMessageSystem* msg, void**)
std::string object_name;
S32 chat_channel;
- msg->getString("Data", "FirstName", first_name);
- msg->getString("Data", "LastName", last_name);
- msg->getString("Data", "ObjectName", object_name);
- msg->getString("Data", "Message", message);
- msg->getS32("Data", "ChatChannel", chat_channel);
+ msg->getStringFast(_PREHASH_Data, _PREHASH_FirstName, first_name);
+ msg->getStringFast(_PREHASH_Data, _PREHASH_LastName, last_name);
+ msg->getStringFast(_PREHASH_Data, _PREHASH_ObjectName, object_name);
+ msg->getStringFast(_PREHASH_Data, _PREHASH_Message, message);
+ msg->getS32Fast(_PREHASH_Data, _PREHASH_ChatChannel, chat_channel);
// unused for now
LLUUID image_id;
- msg->getUUID("Data", "ImageID", image_id);
+ msg->getUUIDFast(_PREHASH_Data, _PREHASH_ImageID, image_id);
payload["sender"] = msg->getSender().getIPandPort();
payload["object_id"] = object_id;
@@ -7008,7 +7008,7 @@ void process_script_dialog(LLMessageSystem* msg, void**)
payload["object_name"] = object_name;
// build up custom form
- S32 button_count = msg->getNumberOfBlocks("Buttons");
+ S32 button_count = msg->getNumberOfBlocksFast(_PREHASH_Buttons);
if (button_count > SCRIPT_DIALOG_MAX_BUTTONS)
{
LL_WARNS() << "Too many script dialog buttons - omitting some" << LL_ENDL;
@@ -7019,7 +7019,7 @@ void process_script_dialog(LLMessageSystem* msg, void**)
for (i = 0; i < button_count; i++)
{
std::string tdesc;
- msg->getString("Buttons", "ButtonLabel", tdesc, i);
+ msg->getStringFast(_PREHASH_Buttons, _PREHASH_ButtonLabel, tdesc, i);
form.addElement("button", std::string(tdesc));
}
@@ -7168,7 +7168,7 @@ void callback_download_complete(void** data, S32 result, LLExtStat ext_status)
void process_initiate_download(LLMessageSystem* msg, void**)
{
LLUUID agent_id;
- msg->getUUID("AgentData", "AgentID", agent_id);
+ msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
if (agent_id != gAgent.getID())
{
LL_WARNS("Messaging") << "Initiate download for wrong agent" << LL_ENDL;
@@ -7177,8 +7177,8 @@ void process_initiate_download(LLMessageSystem* msg, void**)
std::string sim_filename;
std::string viewer_filename;
- msg->getString("FileData", "SimFilename", sim_filename);
- msg->getString("FileData", "ViewerFilename", viewer_filename);
+ msg->getStringFast(_PREHASH_FileData, _PREHASH_SimFilename, sim_filename);
+ msg->getStringFast(_PREHASH_FileData, _PREHASH_ViewerFilename, viewer_filename);
if (!gXferManager->validateFileForRequest(viewer_filename))
{
@@ -7204,10 +7204,10 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
LLVector3 pos;
LLVector3 look_at;
- msg->getString("Data", "ObjectName", object_name);
- msg->getString("Data", "SimName", sim_name);
- msg->getVector3("Data", "SimPosition", pos);
- msg->getVector3("Data", "LookAt", look_at);
+ msg->getStringFast(_PREHASH_Data, _PREHASH_ObjectName, object_name);
+ msg->getStringFast(_PREHASH_Data, _PREHASH_SimName, sim_name);
+ msg->getVector3Fast(_PREHASH_Data, _PREHASH_SimPosition, pos);
+ msg->getVector3Fast(_PREHASH_Data, _PREHASH_LookAt, look_at);
LLFloaterWorldMap* instance = LLFloaterWorldMap::getInstance();
if(instance)
@@ -7232,10 +7232,10 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
LLUUID covenant_id, estate_owner_id;
std::string estate_name;
U32 covenant_timestamp;
- msg->getUUID("Data", "CovenantID", covenant_id);
- msg->getU32("Data", "CovenantTimestamp", covenant_timestamp);
- msg->getString("Data", "EstateName", estate_name);
- msg->getUUID("Data", "EstateOwnerID", estate_owner_id);
+ msg->getUUIDFast(_PREHASH_Data, _PREHASH_CovenantID, covenant_id);
+ msg->getU32Fast(_PREHASH_Data, _PREHASH_CovenantTimestamp, covenant_timestamp);
+ msg->getStringFast(_PREHASH_Data, _PREHASH_EstateName, estate_name);
+ msg->getUUIDFast(_PREHASH_Data, _PREHASH_EstateOwnerID, estate_owner_id);
LLPanelEstateCovenant::updateEstateName(estate_name);
LLPanelLandCovenant::updateEstateName(estate_name);
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 4b3e20413591d69fe1763cb52c4f7cb85401113a..90fe11d80b581cd1a0c916e60130b25d4039e119 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4830,11 +4830,11 @@ void LLViewerObject::sendTEUpdate() const
msg->addU32Fast(_PREHASH_ObjectLocalID, mLocalID );
if (mMedia)
{
- msg->addString("MediaURL", mMedia->mMediaURL);
+ msg->addStringFast(_PREHASH_MediaURL, mMedia->mMediaURL);
}
else
{
- msg->addString("MediaURL", NULL);
+ msg->addStringFast(_PREHASH_MediaURL, NULL);
}
// TODO send media type
@@ -6555,28 +6555,28 @@ void LLViewerObject::updateFlags(BOOL physics_changed)
{
LLViewerRegion* regionp = getRegion();
if(!regionp) return;
- gMessageSystem->newMessage("ObjectFlagUpdate");
+ gMessageSystem->newMessageFast(_PREHASH_ObjectFlagUpdate);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, getLocalID() );
gMessageSystem->addBOOLFast(_PREHASH_UsePhysics, flagUsePhysics() );
- gMessageSystem->addBOOL("IsTemporary", flagTemporaryOnRez() );
- gMessageSystem->addBOOL("IsPhantom", flagPhantom() );
+ gMessageSystem->addBOOLFast(_PREHASH_IsTemporary, flagTemporaryOnRez() );
+ gMessageSystem->addBOOLFast(_PREHASH_IsPhantom, flagPhantom() );
// stinson 02/28/2012 : This CastsShadows BOOL is no longer used in either the viewer or the simulator
// The simulator code does not even unpack this value when the message is received.
// This could be potentially hijacked in the future for another use should the urgent need arise.
- gMessageSystem->addBOOL("CastsShadows", FALSE );
+ gMessageSystem->addBOOLFast(_PREHASH_CastsShadows, FALSE );
if (physics_changed)
{
- gMessageSystem->nextBlock("ExtraPhysics");
- gMessageSystem->addU8("PhysicsShapeType", getPhysicsShapeType() );
- gMessageSystem->addF32("Density", getPhysicsDensity() );
- gMessageSystem->addF32("Friction", getPhysicsFriction() );
- gMessageSystem->addF32("Restitution", getPhysicsRestitution() );
- gMessageSystem->addF32("GravityMultiplier", getPhysicsGravity() );
+ gMessageSystem->nextBlockFast(_PREHASH_ExtraPhysics);
+ gMessageSystem->addU8Fast(_PREHASH_PhysicsShapeType, getPhysicsShapeType() );
+ gMessageSystem->addF32Fast(_PREHASH_Density, getPhysicsDensity() );
+ gMessageSystem->addF32Fast(_PREHASH_Friction, getPhysicsFriction() );
+ gMessageSystem->addF32Fast(_PREHASH_Restitution, getPhysicsRestitution() );
+ gMessageSystem->addF32Fast(_PREHASH_GravityMultiplier, getPhysicsGravity() );
}
gMessageSystem->sendReliable( regionp->getHost() );
}
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index 83b05e6b4d2e1c0ecc26911df38643d3ea2f0a43..a0f62634049b7b0058a85bd4f26b8236a7031ffb 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -50,8 +50,8 @@ LLViewerParcelMedia::LLViewerParcelMedia():
mMediaParcelLocalID(0)
{
LLMessageSystem* msg = gMessageSystem;
- msg->setHandlerFunc("ParcelMediaCommandMessage", parcelMediaCommandMessageHandler );
- msg->setHandlerFunc("ParcelMediaUpdate", parcelMediaUpdateHandler );
+ msg->setHandlerFuncFast(_PREHASH_ParcelMediaCommandMessage, parcelMediaCommandMessageHandler );
+ msg->setHandlerFuncFast(_PREHASH_ParcelMediaUpdate, parcelMediaUpdateHandler );
// LLViewerParcelMediaAutoPlay will regularly check and autoplay media,
// might be good idea to just integrate it into LLViewerParcelMedia
@@ -331,9 +331,9 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg
U32 flags;
U32 command;
F32 time;
- msg->getU32( "CommandBlock", "Flags", flags );
- msg->getU32( "CommandBlock", "Command", command);
- msg->getF32( "CommandBlock", "Time", time );
+ msg->getU32Fast(_PREHASH_CommandBlock, _PREHASH_Flags, flags );
+ msg->getU32Fast(_PREHASH_CommandBlock, _PREHASH_Command, command);
+ msg->getF32Fast(_PREHASH_CommandBlock, _PREHASH_Time, time );
if (flags &( (1<<PARCEL_MEDIA_COMMAND_STOP)
| (1<<PARCEL_MEDIA_COMMAND_PAUSE)
@@ -403,11 +403,11 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg)
U8 media_auto_scale = FALSE;
U8 media_loop = FALSE;
- msg->getUUID( "DataBlock", "MediaID", media_id );
+ msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_MediaID, media_id );
char media_url_buffer[257];
- msg->getString( "DataBlock", "MediaURL", 255, media_url_buffer );
+ msg->getStringFast(_PREHASH_DataBlock, _PREHASH_MediaURL, 255, media_url_buffer );
media_url = media_url_buffer;
- msg->getU8("DataBlock", "MediaAutoScale", media_auto_scale);
+ msg->getU8Fast(_PREHASH_DataBlock, _PREHASH_MediaAutoScale, media_auto_scale);
if (msg->has("DataBlockExtended")) // do we have the extended data?
{
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 0386351ebc60eaa8b0e45467b67d0867c412c95b..df03b0713dcf9fd9fd8b3ba8d0989b0c0403c708 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -970,7 +970,7 @@ void LLViewerParcelMgr::sendParcelAccessListRequest(U32 flags)
msg->nextBlockFast(_PREHASH_Data);
msg->addS32Fast(_PREHASH_SequenceID, 0);
msg->addU32Fast(_PREHASH_Flags, flags);
- msg->addS32("LocalID", mCurrentParcel->getLocalID() );
+ msg->addS32Fast(_PREHASH_LocalID, mCurrentParcel->getLocalID() );
msg->sendReliable( region->getHost() );
}
@@ -988,13 +988,13 @@ void LLViewerParcelMgr::sendParcelDwellRequest()
LLMessageSystem *msg = gMessageSystem;
// Only the headers differ
- msg->newMessage("ParcelDwellRequest");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID() );
- msg->addUUID("SessionID", gAgent.getSessionID());
- msg->nextBlock("Data");
- msg->addS32("LocalID", mCurrentParcel->getLocalID());
- msg->addUUID("ParcelID", LLUUID::null); // filled in on simulator
+ msg->newMessageFast(_PREHASH_ParcelDwellRequest);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->nextBlockFast(_PREHASH_Data);
+ msg->addS32Fast(_PREHASH_LocalID, mCurrentParcel->getLocalID());
+ msg->addUUIDFast(_PREHASH_ParcelID, LLUUID::null); // filled in on simulator
msg->sendReliable( region->getHost() );
}
diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp
index 8aba44f6a0f498c888b85a881b290f030be0b815..ac4101bd9bd6219bf0a07bbf0b1e171b931dcd19 100644
--- a/indra/newview/llworldmapmessage.cpp
+++ b/indra/newview/llworldmapmessage.cpp
@@ -240,7 +240,7 @@ void LLWorldMapMessage::processMapItemReply(LLMessageSystem* msg, void**)
U32 type;
msg->getU32Fast(_PREHASH_RequestData, _PREHASH_ItemType, type);
- S32 num_blocks = msg->getNumberOfBlocks("Data");
+ S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_Data);
auto& world_map = LLWorldMap::instance();
diff --git a/indra/newview/rlvlocks.cpp b/indra/newview/rlvlocks.cpp
index cdfcaa9f7033271dc7e85c21836068cda1db16ed..5b022fe786d61d068b94aee11361e7e15992e039 100644
--- a/indra/newview/rlvlocks.cpp
+++ b/indra/newview/rlvlocks.cpp
@@ -494,7 +494,7 @@ void RlvAttachmentLockWatchdog::detach(const LLViewerObject* pAttachObj)
{
if (pAttachObj)
{
- gMessageSystem->newMessage("ObjectDetach");
+ gMessageSystem->newMessageFast(_PREHASH_ObjectDetach);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
@@ -524,7 +524,7 @@ void RlvAttachmentLockWatchdog::detach(S32 idxAttachPt, const uuid_vec_t& idsAtt
if (!attachObjs.empty())
{
- gMessageSystem->newMessage("ObjectDetach");
+ gMessageSystem->newMessageFast(_PREHASH_ObjectDetach);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());