Added better opensim support, snowglobe doesnt like opensim that much...

this might also break proxy...
This commit is contained in:
phr0z3nt04st
2010-06-18 15:31:24 -05:00
parent d0ed7c5f2b
commit 9f44d1d504
4 changed files with 34 additions and 5 deletions

View File

@@ -37,6 +37,9 @@
#include "llworldmap.h"
#include "llagent.h"
#include "llfloaterworldmap.h"
// <edit>
#include "llviewernetwork.h" //for isInProductionGrid()
// </edit>
const U32 LAYER_FLAG = 2;
@@ -159,7 +162,9 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
msg->getU32Fast(_PREHASH_AgentData, _PREHASH_Flags, agent_flags);
// There's only one flag that we ever use here
if (agent_flags != LAYER_FLAG)
if (agent_flags != LAYER_FLAG
//<edit>
&& LLViewerLogin::getInstance()->getGridChoice() < GRID_INFO_OTHER)
{
llwarns << "Invalid map image type returned! layer = " << agent_flags << llendl;
return;