diff options
| author | Ansariel Hiller <Ansariel@users.noreply.github.com> | 2024-08-08 23:21:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-09 00:21:28 +0300 |
| commit | f782f5f5345e68e0c579e5fe78be94f749723dee (patch) | |
| tree | 480ead521f7508b34f8f54473834d50649d14334 /indra/newview | |
| parent | fe0f1be17bfd83323f2fcda124f3327cc14b0cad (diff) | |
Fix copy&paste error in LLPanelFace (#2233)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llpanelface.h | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 94674dc557..544b6fbc9c 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -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) diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index 1caca0cf64..dfd3201533 100644 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -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 // |