diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 51a1bbc27abea6008901a73f39e17169e9a46f3a..a292cbb0de523cbfbbe13099f766ab75481e0bc1 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 efa25bfb3ced66986597ebaaf3b3ef3655962566..6f74fb167aabd71d8f5b8de572ee07a5871d1b4f 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) {