From 1cfa126279f06bf4de7b78af0a2ab09a5a3a9759 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 19 Jun 2015 17:49:05 -0400
Subject: [PATCH] workarounds to get this building again; note: review mute
list caching change before promoting
---
indra/newview/llpresetsmanager.cpp | 2 +-
indra/newview/llvoavatar.cpp | 7 ++++---
indra/newview/llvoavatar.h | 1 -
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index 9fa52828628..dd25c0d1b8e 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -177,7 +177,7 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, const std::st
std::string pathName(getPresetsDir(subdirectory) + gDirUtilp->getDirDelimiter() + LLURI::escape(name) + ".xml");
// write to file
- llofstream presetsXML(pathName);
+ llofstream presetsXML(pathName.c_str());
if (!presetsXML.is_open())
{
LL_WARNS("Presets") << "Cannot open for output preset file " << pathName << LL_ENDL;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index c3cc5a5faed..2037a924640 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -712,9 +712,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
mIsEditingAppearance(FALSE),
mUseLocalAppearance(FALSE),
mLastUpdateRequestCOFVersion(-1),
- mLastUpdateReceivedCOFVersion(-1),
- mCachedMuteListUpdateTime(0),
- mCachedInMuteList(false)
+ mLastUpdateReceivedCOFVersion(-1)
{
LL_DEBUGS("AvatarRender") << "LLVOAvatar Constructor (0x" << this << ") id:" << mID << LL_ENDL;
@@ -3084,6 +3082,7 @@ bool LLVOAvatar::isVisuallyMuted() const
return ( mVisuallyMuteSetting == ALWAYS_VISUAL_MUTE );
}
+#if 0 // TBD
bool LLVOAvatar::isInMuteList()
{
bool muted = false;
@@ -3102,6 +3101,8 @@ bool LLVOAvatar::isInMuteList()
}
return muted;
}
+#endif
+
void LLVOAvatar::updateDebugText()
{
// clear debug text
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index ba12cb35a7f..48f7ea92e1d 100755
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -385,7 +385,6 @@ class LLVOAvatar :
public:
U32 renderImpostor(LLColor4U color = LLColor4U(255,255,255,255), S32 diffuse_channel = 0);
bool isVisuallyMuted() const;
- bool isInMuteList();
void forceUpdateVisualMuteSettings();
enum VisualMuteSettings
--
GitLab