livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix copy&paste error in LLPanelFace (#2233)

master
Ansariel Hiller 2024-08-08 23:21:28 +02:00 committed by GitHub
parent fe0f1be17b
commit f782f5f534
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llpanelface.cpp
View File

@ -1425,8 +1425,8 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
{
mTexScaleV->setValue(diff_scale_t);
}
mShinyScaleV->setValue(norm_scale_t);
mBumpyScaleV->setValue(spec_scale_t);
mShinyScaleV->setValue(spec_scale_t);
mBumpyScaleV->setValue(norm_scale_t);
mTexScaleV->setTentative(LLSD(diff_scale_tentative));
mShinyScaleV->setTentative(LLSD(spec_scale_tentative));
@ -2181,7 +2181,7 @@ void LLPanelFace::onMaterialOverrideReceived(const LLUUID& object_id, S32 side)
//////////////////////////////////////////////////////////////////////////////
//
void LLPanelFace::navigateToTitleMedia( const std::string url )
void LLPanelFace::navigateToTitleMedia(const std::string& url)
{
std::string multi_media_info_str = LLTrans::getString("Multiple Media");
if (url.empty() || multi_media_info_str == url)
@ -2193,9 +2193,9 @@ void LLPanelFace::navigateToTitleMedia( const std::string url )
{
LLPluginClassMedia* media_plugin = mTitleMedia->getMediaPlugin();
// check if url changed or if we need a new media source
if (mTitleMedia->getCurrentNavUrl() != url || media_plugin == NULL)
if (mTitleMedia->getCurrentNavUrl() != url || media_plugin == nullptr)
{
mTitleMedia->navigateTo( url );
mTitleMedia->navigateTo(url);
LLViewerMediaImpl* impl = LLViewerMedia::getInstance()->getMediaImplFromTextureID(mTitleMedia->getTextureID());
if (impl)

5
indra/newview/llpanelface.h
View File

@ -133,7 +133,7 @@ public:
LLGLTFMaterial::TextureInfo getPBRDropChannel();
protected:
void navigateToTitleMedia(const std::string url);
void navigateToTitleMedia(const std::string& url);
bool selectedMediaEditable();
void clearMediaSettings();
void updateMediaSettings();
@ -226,7 +226,6 @@ protected:
void onCommitMaterialGloss();
void onCommitMaterialEnv();
void onCommitMaterialMaskCutoff();
void onCommitMaterialID();
void onCommitMaterialsMedia();
void onCommitMaterialType();
@ -270,7 +269,7 @@ protected:
static F32 valueGlow(LLViewerObject* object, S32 face);
private:
bool isAlpha() { return mIsAlpha; }
bool isAlpha() const { return mIsAlpha; }
// Convenience funcs to keep the visual flack to a minimum
//