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

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llworldmap.cpp
View File

@@ -462,12 +462,12 @@ void LLWorldMap::sendMapLayerRequest()
{
LLSD body;
body["Flags"] = (LLSD::Integer)flags;
//llinfos << "LLWorldMap::sendMapLayerRequest via capability" << llendl;
//LL_INFOS() << "LLWorldMap::sendMapLayerRequest via capability" << LL_ENDL;
LLHTTPClient::post(url, body, new LLMapLayerResponder);
}
else
{
//llinfos << "LLWorldMap::sendMapLayerRequest via message system" << llendl;
//LL_INFOS() << "LLWorldMap::sendMapLayerRequest via message system" << LL_ENDL;
LLMessageSystem* msg = gMessageSystem;
// Request for layer
@@ -487,7 +487,7 @@ void LLWorldMap::sendMapLayerRequest()
// public static
void LLWorldMap::processMapLayerReply(LLMessageSystem* msg, void**)
{
//llinfos << "LLWorldMap::processMapLayerReply from message system" << llendl;
//LL_INFOS() << "LLWorldMap::processMapLayerReply from message system" << LL_ENDL;
U32 agent_flags;
msg->getU32Fast(_PREHASH_AgentData, _PREHASH_Flags, agent_flags);
@@ -495,7 +495,7 @@ void LLWorldMap::processMapLayerReply(LLMessageSystem* msg, void**)
U32 layer = flagsToLayer(agent_flags);
if (layer != SIM_LAYER_COMPOSITE)
{
llwarns << "Invalid or out of date map image type returned!" << llendl;
LL_WARNS() << "Invalid or out of date map image type returned!" << LL_ENDL;
return;
}