From 0ac10a9d137114b8ea805272708444fbdb09a15c Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 12 Mar 2020 10:20:00 -0400
Subject: [PATCH] Smol opt to rig key gen
---
indra/newview/llsettingsvo.cpp | 4 +---
indra/newview/llvoavatar.cpp | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 51a1bbc27ab..a292cbb0de5 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -704,9 +704,7 @@ void LLSettingsVOSky::applySpecial(void *ptarget, bool force)
shader->uniform1f(LLShaderMgr::DENSITY_MULTIPLIER, getDensityMultiplier());
shader->uniform1f(LLShaderMgr::DISTANCE_MULTIPLIER, getDistanceMultiplier());
- F32 g = getGamma();
-
- shader->uniform1f(LLShaderMgr::GAMMA, g);
+ shader->uniform1f(LLShaderMgr::GAMMA, getGamma());
}
LLSettingsSky::parammapping_t LLSettingsVOSky::getParameterMap() const
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index efa25bfb3ce..6f74fb167aa 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -10072,7 +10072,7 @@ void LLVOAvatar::updateRiggingInfo()
}
// Something changed. Update.
- mLastRiggingInfoKey = curr_rigging_info_key;
+ mLastRiggingInfoKey = std::move(curr_rigging_info_key);
mJointRiggingInfoTab.clear();
for (std::vector<LLVOVolume*>::iterator it = volumes.begin(); it != volumes.end(); ++it)
{
--
GitLab