Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync World Map Message as much as possible to retain OpenSim Compat

Browse Source
This commit is contained in:
Lirusaito
2019-04-09 03:56:23 -04:00
parent 1ef5dc2c5d
commit c85f8345f2
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llworldmapmessage.cpp
View File

@@ -74,10 +74,10 @@ void LLWorldMapMessage::sendItemRequest(U32 type, U64 handle)
void LLWorldMapMessage::sendNamedRegionRequest(std::string region_name) void LLWorldMapMessage::sendNamedRegionRequest(std::string region_name)
{ {
//LL_INFOS("World Map") << "LLWorldMap::sendNamedRegionRequest()" << LL_ENDL; //LL_INFOS("WorldMap") << LL_ENDL;
LLMessageSystem* msg = gMessageSystem; LLMessageSystem* msg = gMessageSystem;
// Request for layer // Request for region data
msg->newMessageFast(_PREHASH_MapNameRequest); msg->newMessageFast(_PREHASH_MapNameRequest);
msg->nextBlockFast(_PREHASH_AgentData); msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
@@ -95,7 +95,7 @@ void LLWorldMapMessage::sendNamedRegionRequest(std::string region_name,
const std::string& callback_url, const std::string& callback_url,
bool teleport) // immediately teleport when result returned bool teleport) // immediately teleport when result returned
{ {
//LL_INFOS("World Map") << "LLWorldMap::sendNamedRegionRequest()" << LL_ENDL; //LL_INFOS("WorldMap") << LL_ENDL;
mSLURLRegionName = region_name; mSLURLRegionName = region_name;
mSLURLRegionHandle = 0; mSLURLRegionHandle = 0;
mSLURL = callback_url; mSLURL = callback_url;
@@ -110,7 +110,7 @@ void LLWorldMapMessage::sendHandleRegionRequest(U64 region_handle,
const std::string& callback_url, const std::string& callback_url,
bool teleport) // immediately teleport when result returned bool teleport) // immediately teleport when result returned
{ {
//LL_INFOS("World Map") << "LLWorldMap::sendHandleRegionRequest()" << LL_ENDL; //LL_INFOS("WorldMap") << LL_ENDL;
mSLURLRegionName.clear(); mSLURLRegionName.clear();
mSLURLRegionHandle = region_handle; mSLURLRegionHandle = region_handle;
mSLURL = callback_url; mSLURL = callback_url;
@@ -123,13 +123,12 @@ void LLWorldMapMessage::sendHandleRegionRequest(U64 region_handle,
U16 grid_x = (U16)(global_x / REGION_WIDTH_UNITS); U16 grid_x = (U16)(global_x / REGION_WIDTH_UNITS);
U16 grid_y = (U16)(global_y / REGION_WIDTH_UNITS); U16 grid_y = (U16)(global_y / REGION_WIDTH_UNITS);
sendMapBlockRequest(grid_x, grid_y, grid_x, grid_y, true, LAYER_FLAG); sendMapBlockRequest(grid_x, grid_y, grid_x, grid_y, true);
} }
// public
void LLWorldMapMessage::sendMapBlockRequest(U16 min_x, U16 min_y, U16 max_x, U16 max_y, bool return_nonexistent, S32 layer) void LLWorldMapMessage::sendMapBlockRequest(U16 min_x, U16 min_y, U16 max_x, U16 max_y, bool return_nonexistent, S32 layer)
{ {
//LL_INFOS("World Map") << "LLWorldMap::sendMapBlockRequest()" << ", min = (" << min_x << ", " << min_y << "), max = (" << max_x << ", " << max_y << "), nonexistent = " << return_nonexistent << LL_ENDL; //LL_INFOS("WorldMap" << " min = (" << min_x << ", " << min_y << "), max = (" << max_x << ", " << max_y << ", nonexistent = " << return_nonexistent << LL_ENDL;
LLMessageSystem* msg = gMessageSystem; LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_MapBlockRequest); msg->newMessageFast(_PREHASH_MapBlockRequest);
msg->nextBlockFast(_PREHASH_AgentData); msg->nextBlockFast(_PREHASH_AgentData);
@@ -162,7 +161,7 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
} }
S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_Data); S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_Data);
//LL_INFOS("World Map") << "LLWorldMap::processMapBlockReply(), num_blocks = " << num_blocks << LL_ENDL; //LL_INFOS("WorldMap") << "num_blocks = " << num_blocks << LL_ENDL;
bool found_null_sim = false; bool found_null_sim = false;
@@ -239,7 +238,6 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
url_callback_t callback = LLWorldMapMessage::getInstance()->mSLURLCallback; url_callback_t callback = LLWorldMapMessage::getInstance()->mSLURLCallback;
if(callback != NULL) if(callback != NULL)
{ {
// Check if we reached the requested region // Check if we reached the requested region
if ((LLStringUtil::compareInsensitive(LLWorldMapMessage::getInstance()->mSLURLRegionName, name)==0) if ((LLStringUtil::compareInsensitive(LLWorldMapMessage::getInstance()->mSLURLRegionName, name)==0)
|| (LLWorldMapMessage::getInstance()->mSLURLRegionHandle == handle)) || (LLWorldMapMessage::getInstance()->mSLURLRegionHandle == handle))
@@ -264,7 +262,7 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
// public static // public static
void LLWorldMapMessage::processMapItemReply(LLMessageSystem* msg, void**) void LLWorldMapMessage::processMapItemReply(LLMessageSystem* msg, void**)
{ {
//LL_INFOS("World Map") << "LLWorldMap::processMapItemReply()" << LL_ENDL; //LL_INFOS("WorldMap") << LL_ENDL;
U32 type; U32 type;
msg->getU32Fast(_PREHASH_RequestData, _PREHASH_ItemType, type); msg->getU32Fast(_PREHASH_RequestData, _PREHASH_ItemType, type);