Skip to content

GitLab

Commit bed9e405 authored by Rye Mutt's avatar Rye Mutt 🍞
Browse files

Further cleanup of UDP functions to reduce mutex locks and stutter

parent e2f3fb1c
Hide whitespace changes
Inline Side-by-side
indra/llinventory/lllandmark.cpp
View file @ bed9e405
......@@ -207,7 +207,7 @@ LLLandmark* LLLandmark::constructFromString(const char *buffer, const S32 buffer
// static
void LLLandmark::registerCallbacks(LLMessageSystem* msg)
{
msg->setHandlerFunc("RegionIDAndHandleReply", &processRegionIDAndHandle);
msg->setHandlerFuncFast(_PREHASH_RegionIDAndHandleReply, &processRegionIDAndHandle);
}
// static
......
indra/llmessage/message.cpp
View file @ bed9e405
......@@ -2152,18 +2152,18 @@ S32 LLMessageSystem::sendError(
const std::string& message,
const LLSD& data)
{
newMessage("Error");
newMessageFast(_PREHASH_Error);
nextBlockFast(_PREHASH_AgentData);
addUUIDFast(_PREHASH_AgentID, agent_id);
nextBlockFast(_PREHASH_Data);
addS32("Code", code);
addString("Token", token);
addUUID("ID", id);
addString("System", system);
addS32Fast(_PREHASH_Code, code);
addStringFast(_PREHASH_Token, token);
addUUIDFast(_PREHASH_ID, id);
addStringFast(_PREHASH_System, system);
std::string temp;
temp = message;
if(temp.size() > (size_t)MTUBYTES) temp.resize((size_t)MTUBYTES);
addString("Message", message);
addStringFast(_PREHASH_Message, message);
LLPointer<LLSDBinaryFormatter> formatter = new LLSDBinaryFormatter;
std::ostringstream ostr;
formatter->format(data, ostr);
......@@ -2181,13 +2181,13 @@ S32 LLMessageSystem::sendError(
}
if(pack_data)
{
addBinaryData("Data", (void*)temp.c_str(), temp.size());
addBinaryDataFast(_PREHASH_Data, (void*)temp.c_str(), temp.size());
}
else
{
LL_WARNS("Messaging") << "Data and message were too large -- data removed."
<< LL_ENDL;
addBinaryData("Data", NULL, 0);
addBinaryDataFast(_PREHASH_Data, NULL, 0);
}
return sendReliable(host);
}
......@@ -3341,7 +3341,7 @@ void LLMessageSystem::establishBidirectionalTrust(const LLHost &host, S64 frame_
// Send a request, a deny, and give the host 2 seconds to complete
// the trust handshake.
newMessage("RequestTrustedCircuit");
newMessageFast(_PREHASH_RequestTrustedCircuit);
sendMessage(host);
reallySendDenyTrustedCircuit(host);
setHandlerFuncFast(_PREHASH_StartPingCheck, process_start_ping_check, NULL);
......
indra/newview/llcallingcard.cpp
View file @ bed9e405
......@@ -577,8 +577,8 @@ void LLAvatarTracker::registerCallbacks(LLMessageSystem* msg)
processOfflineNotification);
//msg->setHandlerFuncFast(_PREHASH_GrantedProxies,
// processGrantedProxies);
msg->setHandlerFunc("TerminateFriendship", processTerminateFriendship);
msg->setHandlerFunc(_PREHASH_ChangeUserRights, processChangeUserRights);
msg->setHandlerFuncFast(_PREHASH_TerminateFriendship, processTerminateFriendship);
msg->setHandlerFuncFast(_PREHASH_ChangeUserRights, processChangeUserRights);
}
// static
......
indra/newview/llfloaterauction.cpp
View file @ bed9e405
......@@ -262,14 +262,14 @@ void LLFloaterAuction::onClickStartAuction(void* data)
}
LLMessageSystem* msg = gMessageSystem;
msg->newMessage("ViewerStartAuction");
msg->nextBlock("AgentData");
msg->addUUID("AgentID", gAgent.getID());
msg->addUUID("SessionID", gAgent.getSessionID());
msg->nextBlock("ParcelData");
msg->addS32("LocalID", self->mParcelID);
msg->addUUID("SnapshotID", self->mImageID);
msg->newMessageFast(_PREHASH_ViewerStartAuction);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->nextBlockFast(_PREHASH_ParcelData);
msg->addS32Fast(_PREHASH_LocalID, self->mParcelID);
msg->addUUIDFast(_PREHASH_SnapshotID, self->mImageID);
msg->sendReliable(self->mParcelHost);
// clean up floater, and get out
......
indra/newview/llfloatergodtools.cpp
View file @ bed9e405
......@@ -861,16 +861,16 @@ bool LLPanelGridTools::flushMapVisibilityCachesConfirm(const LLSD& notification,
// HACK: Send this as an EstateOwnerRequest so it gets routed
// correctly by the spaceserver. JC
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", "refreshmapvisibility");
msg->addUUID("Invoice", LLUUID::null);
msg->nextBlock("ParamList");
msg->addString("Parameter", gAgent.getID().asString());
msg->nextBlockFast(_PREHASH_MethodData);
msg->addStringFast(_PREHASH_Method, "refreshmapvisibility");
msg->addUUIDFast(_PREHASH_Invoice, LLUUID::null);
msg->nextBlockFast(_PREHASH_ParamList);
msg->addStringFast(_PREHASH_Parameter, gAgent.getID().asString());
gAgent.sendReliableMessage();
return false;
}
......@@ -1254,16 +1254,16 @@ void LLPanelRequestTools::sendRequest(const std::string& request,
LL_INFOS() << "Sending request '" << request << "', '"
<< parameter << "' to " << host << LL_ENDL;
LLMessageSystem* msg = gMessageSystem;
msg->newMessage("GodlikeMessage");
msg->newMessageFast(_PREHASH_GodlikeMessage);
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", request);
msg->addUUID("Invoice", LLUUID::null);
msg->nextBlock("ParamList");
msg->addString("Parameter", parameter);
msg->nextBlockFast(_PREHASH_MethodData);
msg->addStringFast(_PREHASH_Method, request);
msg->addUUIDFast(_PREHASH_Invoice, LLUUID::null);
msg->nextBlockFast(_PREHASH_ParamList);
msg->addStringFast(_PREHASH_Parameter, parameter);
msg->sendReliable(host);
}
......
indra/newview/llfloaterpay.cpp
View file @ bed9e405
......@@ -350,7 +350,7 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
self->reshape( self->getRect().getWidth() + padding_required, self->getRect().getHeight(), FALSE );
}
msg->setHandlerFunc("PayPriceReply",NULL,NULL);
msg->setHandlerFuncFast(_PREHASH_PayPriceReply,NULL,NULL);
}
// static
......
indra/newview/llfloaterregioninfo.cpp
View file @ bed9e405
......@@ -289,8 +289,7 @@ BOOL LLFloaterRegionInfo::postBuild()
mTab->addTabPanel(panel);
}
gMessageSystem->setHandlerFunc(
"EstateOwnerMessage",
gMessageSystem->setHandlerFuncFast(_PREHASH_EstateOwnerMessage,
&processEstateOwnerRequest);
// Request region info when agent region changes.
......@@ -357,10 +356,10 @@ void LLFloaterRegionInfo::requestRegionInfo()
// so non-owners/non-gods can see the values.
// Therefore can't use an EstateOwnerMessage JC
LLMessageSystem* msg = gMessageSystem;
msg->newMessage("RequestRegionInfo");
msg->nextBlock("AgentData");
msg->addUUID("AgentID", gAgent.getID());
msg->addUUID("SessionID", gAgent.getSessionID());
msg->newMessageFast(_PREHASH_RequestRegionInfo);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
gAgent.sendReliableMessage();
}
......@@ -751,18 +750,18 @@ void LLPanelRegionInfo::sendEstateOwnerMessage(
const strings_t& strings)
{
LL_INFOS() << "Sending estate request '" << request << "'" << LL_ENDL;
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", request);
msg->addUUID("Invoice", invoice);
msg->nextBlockFast(_PREHASH_MethodData);
msg->addStringFast(_PREHASH_Method, request);
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
{
......@@ -770,8 +769,8 @@ void LLPanelRegionInfo::sendEstateOwnerMessage(
strings_t::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);
}
}
msg->sendReliable(mHost);
......@@ -2093,7 +2092,7 @@ bool LLPanelEstateCovenant::refreshFromRegion(LLViewerRegion* region)
// let the parent class handle the general data collection.
bool rv = LLPanelRegionInfo::refreshFromRegion(region);
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());
......@@ -2308,18 +2307,18 @@ void LLPanelEstateCovenant::sendChangeCovenantID(const LLUUID &asset_id)
setCovenantID(asset_id);
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", "estatechangecovenantid");
msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
msg->nextBlockFast(_PREHASH_MethodData);
msg->addStringFast(_PREHASH_Method, "estatechangecovenantid");
msg->addUUIDFast(_PREHASH_Invoice, LLFloaterRegionInfo::getLastInvoice());
msg->nextBlock("ParamList");
msg->addString("Parameter", getCovenantID().asString());
msg->nextBlockFast(_PREHASH_ParamList);
msg->addStringFast(_PREHASH_Parameter, getCovenantID().asString());
gAgent.sendReliableMessage();
}
}
......@@ -3473,28 +3472,28 @@ bool LLPanelEstateAccess::accessCoreConfirm(const LLSD& notification, const LLSD
void LLPanelEstateAccess::sendEstateAccessDelta(U32 flags, const LLUUID& agent_or_group_id)
{
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", "estateaccessdelta");
msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
msg->nextBlockFast(_PREHASH_MethodData);
msg->addStringFast(_PREHASH_Method, "estateaccessdelta");
msg->addUUIDFast(_PREHASH_Invoice, LLFloaterRegionInfo::getLastInvoice());
std::string buf;
gAgent.getID().toString(buf);
msg->nextBlock("ParamList");
msg->addString("Parameter", buf);
msg->nextBlockFast(_PREHASH_ParamList);
msg->addStringFast(_PREHASH_Parameter, buf);
buf = llformat("%u", flags);
msg->nextBlock("ParamList");
msg->addString("Parameter", buf);
msg->nextBlockFast(_PREHASH_ParamList);
msg->addStringFast(_PREHASH_Parameter, buf);
agent_or_group_id.toString(buf);
msg->nextBlock("ParamList");
msg->addString("Parameter", buf);
msg->nextBlockFast(_PREHASH_ParamList);
msg->addStringFast(_PREHASH_Parameter, buf);
gAgent.sendReliableMessage();
}
......
indra/newview/llfloatertelehub.cpp
View file @ bed9e405
......@@ -55,7 +55,7 @@ LLFloaterTelehub::LLFloaterTelehub(const LLSD& key)
BOOL LLFloaterTelehub::postBuild()
{
gMessageSystem->setHandlerFunc("TelehubInfo", processTelehubInfo);
gMessageSystem->setHandlerFuncFast(_PREHASH_TelehubInfo, processTelehubInfo);
getChild<LLUICtrl>("connect_btn")->setCommitCallback(boost::bind(&LLFloaterTelehub::onClickConnect, this));
getChild<LLUICtrl>("disconnect_btn")->setCommitCallback(boost::bind(&LLFloaterTelehub::onClickDisconnect, this));
......@@ -85,7 +85,7 @@ void LLFloaterTelehub::onOpen(const LLSD& key)
LLFloaterTelehub::~LLFloaterTelehub()
{
// no longer interested in this message
gMessageSystem->setHandlerFunc("TelehubInfo", NULL);
gMessageSystem->setHandlerFuncFast(_PREHASH_TelehubInfo, NULL);
}
void LLFloaterTelehub::draw()
......@@ -196,27 +196,27 @@ void LLFloaterTelehub::onClickRemoveSpawnPoint()
// Could be god or estate owner. If neither, server will reject message.
if (gAgent.isGodlike())
{
msg->newMessage("GodlikeMessage");
msg->newMessageFast(_PREHASH_GodlikeMessage);
}
else
{
msg->newMessage("EstateOwnerMessage");
msg->newMessageFast(_PREHASH_EstateOwnerMessage);
}
msg->nextBlock("AgentData");
msg->addUUID("AgentID", gAgent.getID());
msg->addUUID("SessionID", gAgent.getSessionID());
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", "telehub");
msg->addUUID("Invoice", LLUUID::null);
msg->nextBlockFast(_PREHASH_MethodData);
msg->addStringFast(_PREHASH_Method, "telehub");
msg->addUUIDFast(_PREHASH_Invoice, LLUUID::null);
msg->nextBlock("ParamList");
msg->addString("Parameter", "spawnpoint remove");
msg->nextBlockFast(_PREHASH_ParamList);
msg->addStringFast(_PREHASH_Parameter, "spawnpoint remove");
std::string buffer;
buffer = llformat("%d", spawn_index);
msg->nextBlock("ParamList");
msg->addString("Parameter", buffer);
msg->nextBlockFast(_PREHASH_ParamList);
msg->addStringFast(_PREHASH_Parameter, buffer);
gAgent.sendReliableMessage();
}
......
indra/newview/llgroupmgr.cpp
View file @ bed9e405
......@@ -1756,20 +1756,20 @@ void LLGroupMgr::sendCreateGroupRequest(const std::string& name,
BOOL mature_publish)
{
LLMessageSystem* msg = gMessageSystem;
msg->newMessage("CreateGroupRequest");
msg->nextBlock("AgentData");
msg->addUUID("AgentID",gAgent.getID());
msg->addUUID("SessionID",gAgent.getSessionID());
msg->nextBlock("GroupData");
msg->addString("Name",name);
msg->addString("Charter",charter);
msg->addBOOL("ShowInList",show_in_list);
msg->addUUID("InsigniaID",insignia);
msg->addS32("MembershipFee",membership_fee);
msg->addBOOL("OpenEnrollment",open_enrollment);
msg->addBOOL("AllowPublish",allow_publish);
msg->addBOOL("MaturePublish",mature_publish);
msg->newMessageFast(_PREHASH_CreateGroupRequest);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID,gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
msg->nextBlockFast(_PREHASH_GroupData);
msg->addStringFast(_PREHASH_Name,name);
msg->addStringFast(_PREHASH_Charter,charter);
msg->addBOOLFast(_PREHASH_ShowInList,show_in_list);
msg->addUUIDFast(_PREHASH_InsigniaID,insignia);
msg->addS32Fast(_PREHASH_MembershipFee,membership_fee);
msg->addBOOLFast(_PREHASH_OpenEnrollment,open_enrollment);
msg->addBOOLFast(_PREHASH_AllowPublish,allow_publish);
msg->addBOOLFast(_PREHASH_MaturePublish,mature_publish);
gAgent.sendReliableMessage();
}
......@@ -1876,18 +1876,18 @@ void LLGroupMgr::sendGroupMemberInvites(const LLUUID& group_id, std::map<LLUUID,
{
if (start_message)
{
msg->newMessage("InviteGroupRequest");
msg->nextBlock("AgentData");
msg->addUUID("AgentID",gAgent.getID());
msg->addUUID("SessionID",gAgent.getSessionID());
msg->nextBlock("GroupData");
msg->addUUID("GroupID",group_id);
msg->newMessageFast(_PREHASH_InviteGroupRequest);
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("InviteData");
msg->addUUID("InviteeID",(*it).first);
msg->addUUID("RoleID",(*it).second);
msg->nextBlockFast(_PREHASH_InviteData);
msg->addUUIDFast(_PREHASH_InviteeID,(*it).first);
msg->addUUIDFast(_PREHASH_RoleID,(*it).second);
if (msg->isSendFullFast())
{
......
indra/newview/llinventorymodel.cpp
View file @ bed9e405
......@@ -2997,7 +2997,7 @@ void LLInventoryModel::registerCallbacks(LLMessageSystem* msg)
msg->setHandlerFuncFast(_PREHASH_BulkUpdateInventory,
processBulkUpdateInventory,
NULL);
msg->setHandlerFunc("MoveInventoryItem", processMoveInventoryItem);
msg->setHandlerFuncFast(_PREHASH_MoveInventoryItem, processMoveInventoryItem);
}
......
indra/newview/llstartup.cpp
View file @ bed9e405
......@@ -2472,13 +2472,13 @@ void register_viewer_callbacks(LLMessageSystem* msg)
msg->setHandlerFuncFast(_PREHASH_ImageData, LLViewerTextureList::receiveImageHeader );
msg->setHandlerFuncFast(_PREHASH_ImagePacket, LLViewerTextureList::receiveImagePacket );
msg->setHandlerFuncFast(_PREHASH_ObjectUpdate, process_object_update );
msg->setHandlerFunc("ObjectUpdateCompressed", process_compressed_object_update );
msg->setHandlerFunc("ObjectUpdateCached", process_cached_object_update );
msg->setHandlerFuncFast(_PREHASH_ObjectUpdateCompressed, process_compressed_object_update );
msg->setHandlerFuncFast(_PREHASH_ObjectUpdateCached, process_cached_object_update );
msg->setHandlerFuncFast(_PREHASH_ImprovedTerseObjectUpdate, process_terse_object_update_improved );
msg->setHandlerFunc("SimStats", process_sim_stats);
msg->setHandlerFuncFast(_PREHASH_SimStats, process_sim_stats);
msg->setHandlerFuncFast(_PREHASH_HealthMessage, process_health_message );
msg->setHandlerFuncFast(_PREHASH_EconomyData, process_economy_data);
msg->setHandlerFunc("RegionInfo", LLViewerRegion::processRegionInfo);
msg->setHandlerFuncFast(_PREHASH_RegionInfo, LLViewerRegion::processRegionInfo);
msg->setHandlerFuncFast(_PREHASH_ChatFromSimulator, process_chat_from_simulator);
msg->setHandlerFuncFast(_PREHASH_KillObject, process_kill_object, NULL);
......@@ -2487,13 +2487,13 @@ void register_viewer_callbacks(LLMessageSystem* msg)
msg->setHandlerFuncFast(_PREHASH_DisableSimulator, process_disable_simulator);
msg->setHandlerFuncFast(_PREHASH_KickUser, process_kick_user, NULL);
msg->setHandlerFunc("CrossedRegion", process_crossed_region);
msg->setHandlerFuncFast(_PREHASH_CrossedRegion, process_crossed_region);
msg->setHandlerFuncFast(_PREHASH_TeleportFinish, process_teleport_finish);
msg->setHandlerFuncFast(_PREHASH_AlertMessage, process_alert_message);
msg->setHandlerFunc("AgentAlertMessage", process_agent_alert_message);
msg->setHandlerFuncFast(_PREHASH_AgentAlertMessage, process_agent_alert_message);
msg->setHandlerFuncFast(_PREHASH_MeanCollisionAlert, process_mean_collision_alert_message, NULL);
msg->setHandlerFunc("ViewerFrozenMessage", process_frozen_message);
msg->setHandlerFuncFast(_PREHASH_ViewerFrozenMessage, process_frozen_message);
msg->setHandlerFuncFast(_PREHASH_NameValuePair, process_name_value);
msg->setHandlerFuncFast(_PREHASH_RemoveNameValuePair, process_remove_name_value);
......@@ -2502,14 +2502,14 @@ void register_viewer_callbacks(LLMessageSystem* msg)
msg->setHandlerFuncFast(_PREHASH_AvatarAppearance, process_avatar_appearance);
msg->setHandlerFuncFast(_PREHASH_CameraConstraint, process_camera_constraint);
msg->setHandlerFuncFast(_PREHASH_AvatarSitResponse, process_avatar_sit_response);
msg->setHandlerFunc("SetFollowCamProperties", process_set_follow_cam_properties);
msg->setHandlerFunc("ClearFollowCamProperties", process_clear_follow_cam_properties);
msg->setHandlerFuncFast(_PREHASH_SetFollowCamProperties, process_set_follow_cam_properties);
msg->setHandlerFuncFast(_PREHASH_ClearFollowCamProperties, process_clear_follow_cam_properties);
msg->setHandlerFuncFast(_PREHASH_ImprovedInstantMessage, process_improved_im);
msg->setHandlerFuncFast(_PREHASH_ScriptQuestion, process_script_question);
msg->setHandlerFuncFast(_PREHASH_ObjectProperties, LLSelectMgr::processObjectProperties, NULL);
msg->setHandlerFuncFast(_PREHASH_ObjectPropertiesFamily, LLSelectMgr::processObjectPropertiesFamily, NULL);
msg->setHandlerFunc("ForceObjectSelect", LLSelectMgr::processForceObjectSelect);
msg->setHandlerFuncFast(_PREHASH_ForceObjectSelect, LLSelectMgr::processForceObjectSelect);
msg->setHandlerFuncFast(_PREHASH_MoneyBalanceReply, process_money_balance_reply, NULL);
msg->setHandlerFuncFast(_PREHASH_CoarseLocationUpdate, LLWorld::processCoarseUpdate, NULL);
......@@ -2520,7 +2520,7 @@ void register_viewer_callbacks(LLMessageSystem* msg)
msg->setHandlerFuncFast(_PREHASH_DeRezAck, process_derez_ack);
msg->setHandlerFunc("LogoutReply", process_logout_reply);
msg->setHandlerFuncFast(_PREHASH_LogoutReply, process_logout_reply);
//msg->setHandlerFuncFast(_PREHASH_AddModifyAbility,
// &LLAgent::processAddModifyAbility);
......@@ -2530,32 +2530,32 @@ void register_viewer_callbacks(LLMessageSystem* msg)
&LLAgent::processAgentDataUpdate);
msg->setHandlerFuncFast(_PREHASH_AgentGroupDataUpdate,
&LLAgent::processAgentGroupDataUpdate);
msg->setHandlerFunc("AgentDropGroup",
msg->setHandlerFuncFast(_PREHASH_AgentDropGroup,
&LLAgent::processAgentDropGroup);
// land ownership messages
msg->setHandlerFuncFast(_PREHASH_ParcelOverlay,
LLViewerParcelMgr::processParcelOverlay);
msg->setHandlerFuncFast(_PREHASH_ParcelProperties,
LLViewerParcelMgr::processParcelProperties);
msg->setHandlerFunc("ParcelAccessListReply",
msg->setHandlerFuncFast(_PREHASH_ParcelAccessListReply,
LLViewerParcelMgr::processParcelAccessListReply);
msg->setHandlerFunc("ParcelDwellReply",
msg->setHandlerFuncFast(_PREHASH_ParcelDwellReply,
LLViewerParcelMgr::processParcelDwellReply);
msg->setHandlerFunc("AvatarPropertiesReply",
msg->setHandlerFuncFast(_PREHASH_AvatarPropertiesReply,
&LLAvatarPropertiesProcessor::processAvatarPropertiesReply);
msg->setHandlerFunc("AvatarInterestsReply",
msg->setHandlerFuncFast(_PREHASH_AvatarInterestsReply,
&LLAvatarPropertiesProcessor::processAvatarInterestsReply);
msg->setHandlerFunc("AvatarGroupsReply",
msg->setHandlerFuncFast(_PREHASH_AvatarGroupsReply,
&LLAvatarPropertiesProcessor::processAvatarGroupsReply);
// ratings deprecated
//msg->setHandlerFuncFast(_PREHASH_AvatarStatisticsReply,
// LLPanelAvatar::processAvatarStatisticsReply);
msg->setHandlerFunc("AvatarNotesReply",
msg->setHandlerFuncFast(_PREHASH_AvatarNotesReply,
&LLAvatarPropertiesProcessor::processAvatarNotesReply);
msg->setHandlerFunc("AvatarPicksReply",
msg->setHandlerFuncFast(_PREHASH_AvatarPicksReply,
&LLAvatarPropertiesProcessor::processAvatarPicksReply);
msg->setHandlerFunc("AvatarClassifiedReply",
msg->setHandlerFuncFast(_PREHASH_AvatarClassifiedReply,
&LLAvatarPropertiesProcessor::processAvatarClassifiedsReply);
msg->setHandlerFuncFast(_PREHASH_CreateGroupReply,
......@@ -2573,7 +2573,7 @@ void register_viewer_callbacks(LLMessageSystem* msg)
// msg->setHandlerFuncFast(_PREHASH_ReputationIndividualReply,
// LLFloaterRate::processReputationIndividualReply);
msg->setHandlerFunc("ScriptControlChange",
msg->setHandlerFuncFast(_PREHASH_ScriptControlChange,
LLAgent::processScriptControlChange );
msg->setHandlerFuncFast(_PREHASH_ViewerEffect, LLHUDManager::processViewerEffect);
......@@ -2590,52 +2590,52 @@ void register_viewer_callbacks(LLMessageSystem* msg)
msg->setHandlerFuncFast(_PREHASH_UserInfoReply,
process_user_info_reply);
msg->setHandlerFunc("RegionHandshake", process_region_handshake, NULL);
msg->setHandlerFuncFast(_PREHASH_RegionHandshake, process_region_handshake, NULL);
msg->setHandlerFunc("TeleportStart", process_teleport_start );
msg->setHandlerFunc("TeleportProgress", process_teleport_progress);
msg->setHandlerFunc("TeleportFailed", process_teleport_failed, NULL);
msg->setHandlerFunc("TeleportLocal", process_teleport_local, NULL);
msg->setHandlerFuncFast(_PREHASH_TeleportStart, process_teleport_start );
msg->setHandlerFuncFast(_PREHASH_TeleportProgress, process_teleport_progress);
msg->setHandlerFuncFast(_PREHASH_TeleportFailed, process_teleport_failed, NULL);
msg->setHandlerFuncFast(_PREHASH_TeleportLocal, process_teleport_local, NULL);
msg->setHandlerFunc("ImageNotInDatabase", LLViewerTextureList::processImageNotInDatabase, NULL);
msg->setHandlerFuncFast(_PREHASH_ImageNotInDatabase, LLViewerTextureList::processImageNotInDatabase, NULL);
msg->setHandlerFuncFast(_PREHASH_GroupMembersReply,
LLGroupMgr::processGroupMembersReply);
msg->setHandlerFunc("GroupRoleDataReply",
msg->setHandlerFuncFast(_PREHASH_GroupRoleDataReply,
LLGroupMgr::processGroupRoleDataReply);
msg->setHandlerFunc("GroupRoleMembersReply",
msg->setHandlerFuncFast(_PREHASH_GroupRoleMembersReply,
LLGroupMgr::processGroupRoleMembersReply);
msg->setHandlerFunc("GroupTitlesReply",
msg->setHandlerFuncFast(_PREHASH_GroupTitlesReply,
LLGroupMgr::processGroupTitlesReply);
// Special handler as this message is sometimes used for group land.
msg->setHandlerFunc("PlacesReply", process_places_reply);
msg->setHandlerFunc("GroupNoticesListReply", LLPanelGroupNotices::processGroupNoticesListReply);
msg->setHandlerFuncFast(_PREHASH_PlacesReply, process_places_reply);
msg->setHandlerFuncFast(_PREHASH_GroupNoticesListReply, LLPanelGroupNotices::processGroupNoticesListReply);
msg->setHandlerFunc("AvatarPickerReply", LLFloaterAvatarPicker::processAvatarPickerReply);
msg->setHandlerFuncFast(_PREHASH_AvatarPickerReply, LLFloaterAvatarPicker::processAvatarPickerReply);
msg->setHandlerFunc("MapBlockReply", LLWorldMapMessage::processMapBlockReply);
msg->setHandlerFunc("MapItemReply", LLWorldMapMessage::processMapItemReply);
msg->setHandlerFunc("EventInfoReply", LLEventNotifier::processEventInfoReply);
msg->setHandlerFuncFast(_PREHASH_MapBlockReply, LLWorldMapMessage::processMapBlockReply);
msg->setHandlerFuncFast(_PREHASH_MapItemReply, LLWorldMapMessage::processMapItemReply);
msg->setHandlerFuncFast(_PREHASH_EventInfoReply, LLEventNotifier::processEventInfoReply);
msg->setHandlerFunc("PickInfoReply", &LLAvatarPropertiesProcessor::processPickInfoReply);
msg->setHandlerFunc("ClassifiedInfoReply", LLAvatarPropertiesProcessor::processClassifiedInfoReply);