From 8d27fc7296b9b862cd811643eea072e756d7e897 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 10 Nov 2021 01:00:05 -0500
Subject: [PATCH] Trivial cleanup
---
indra/newview/llface.h | 2 --
indra/newview/llfloaterimcontainer.cpp | 2 +-
indra/newview/llspatialpartition.h | 2 --
3 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/indra/newview/llface.h b/indra/newview/llface.h
index 04bd7e64562..f0994152ed1 100644
--- a/indra/newview/llface.h
+++ b/indra/newview/llface.h
@@ -252,8 +252,6 @@ class LLFace : public LLTrace::MemTrackableNonVirtual<LLFace, 16>
F32 mLastSkinTime;
F32 mLastMoveTime;
LLMatrix4* mTextureMatrix;
- LLMatrix4* mSpecMapMatrix;
- LLMatrix4* mNormalMapMatrix;
LLDrawInfo* mDrawInfo;
private:
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index a9c5e3db631..597f8ba9f50 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -2282,7 +2282,7 @@ void LLFloaterIMContainer::reSelectConversation()
void LLFloaterIMContainer::updateSpeakBtnState()
{
- mSpeakBtn->setToggleState(LLVoiceClient::getInstance()->getUserPTTState());
+ mSpeakBtn->setToggleState(LLVoiceClient::getInstanceFast()->getUserPTTState());
mSpeakBtn->setEnabled(LLAgent::isActionAllowed("speak"));
}
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
index b8a0767264e..88a822fd32b 100644
--- a/indra/newview/llspatialpartition.h
+++ b/indra/newview/llspatialpartition.h
@@ -102,9 +102,7 @@ class LLDrawInfo : public LLRefCount, public LLTrace::MemTrackableNonVirtual<LLD
U32 mBlendFuncDst;
BOOL mHasGlow;
LLPointer<LLViewerTexture> mSpecularMap;
- const LLMatrix4* mSpecularMapMatrix;
LLPointer<LLViewerTexture> mNormalMap;
- const LLMatrix4* mNormalMapMatrix;
LLVector4 mSpecColor; // XYZ = Specular RGB, W = Specular Exponent
F32 mEnvIntensity;
F32 mAlphaMaskCutoff;
--
GitLab