aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llhudeffectlookat.cpp
diff options
context:
space:
mode:
authorRevolutionSmythe2010-10-30 16:30:31 -0500
committerMcCabe Maxsted2010-11-01 17:05:45 -0700
commit1851199361cf6757c767f8117658336751089c44 (patch)
treee60998f5920f9b9d250d502cb6d2230b5d136f1f /linden/indra/newview/llhudeffectlookat.cpp
parentBug fixes for earlier commits. Adds cut to the inventory panel along with cop... (diff)
downloadmeta-impy-1851199361cf6757c767f8117658336751089c44.zip
meta-impy-1851199361cf6757c767f8117658336751089c44.tar.gz
meta-impy-1851199361cf6757c767f8117658336751089c44.tar.bz2
meta-impy-1851199361cf6757c767f8117658336751089c44.tar.xz
Fixes a missing help button, adds ability to edit trees like normal objects. Adds more places to rebuild clouds so that they will not stick in the incorrect place.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llhudeffectlookat.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index 75e2f30..ccd723f 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -53,6 +53,7 @@
53// [/RLVa:KB] 53// [/RLVa:KB]
54 54
55#include "llxmltree.h" 55#include "llxmltree.h"
56#include "hippolimits.h"
56 57
57 58
58BOOL LLHUDEffectLookAt::sDebugLookAt = FALSE; 59BOOL LLHUDEffectLookAt::sDebugLookAt = FALSE;
@@ -553,7 +554,7 @@ void LLHUDEffectLookAt::setSourceObject(LLViewerObject* objectp)
553//----------------------------------------------------------------------------- 554//-----------------------------------------------------------------------------
554void LLHUDEffectLookAt::render() 555void LLHUDEffectLookAt::render()
555{ 556{
556 if (sDebugLookAt && mSourceObject.notNull()) 557 if (sDebugLookAt && mSourceObject.notNull() && gHippoLimits->mAllowMinimap) //Has to have allow minimap as well, otherwise it defeats the purpose of no minimap
557 { 558 {
558 gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); 559 gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
559 560