From 4d437d972a3123645d51178f06baf22041cc7206 Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Fri, 14 Aug 2015 15:48:12 -0400
Subject: [PATCH] Disable use of map tile for minimap on opensim for now
---
indra/newview/llnetmap.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 0c0681d1d1..369e370275 100755
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -53,6 +53,7 @@
#include "llsurface.h"
#include "llviewercamera.h"
#include "llviewercontrol.h"
+#include "llviewernetwork.h"
#include "llviewertexture.h"
#include "llviewertexturelist.h"
#include "llviewermenu.h"
@@ -258,7 +259,7 @@ void LLNetMap::draw()
// <alchemy>
- if (use_world_map_image)
+ if (use_world_map_image && LLGridManager::getInstance()->isInSecondlife())
{
LLViewerTexture* img = regionp->getMapImage();
if (img && img->hasGLTexture())
--
GitLab