diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 16:49:28 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 16:49:28 -0400 |
commit | 626920dda38a512b27c5e8fd79b0c9b09be01898 (patch) | |
tree | 89c54e31848048ee084005fd3a0a1316f5530966 /indra/newview/llpanelface.cpp | |
parent | f6b3b5e803b0c08d55ecd10eac3e9e75518760a9 (diff) | |
parent | d8e52ec001c476a2320f2d5caceb813465d707e4 (diff) |
Merge remote branch 'develop' into release/luau-scripting for Maint B
Diffstat (limited to 'indra/newview/llpanelface.cpp')
-rw-r--r-- | indra/newview/llpanelface.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 5f8a6fa537..7a63c6e10d 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -5199,4 +5199,3 @@ void LLPanelFace::LLSelectedTE::getMaxDiffuseRepeats(F32& repeats, bool& identic } max_diff_repeats_func; identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &max_diff_repeats_func, repeats ); } - |