diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:29:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-10 10:29:47 +0300 |
| commit | 5118ba7adfc6f49f5b23694507dc7ceb8365b969 (patch) | |
| tree | 4e499acfe5617682c5eca52998b5c10cdac8609a /indra/newview/llpaneleditwearable.h | |
| parent | 16e638db975278f6018fe1e21ba1954b7f159149 (diff) | |
| parent | 84dfe55810815e8c274044cea5c81aaed89a787f (diff) | |
Merge pull request #1179 from secondlife/marchcat/y-merge
Release (Maint W) -> Maint YZ merge
Diffstat (limited to 'indra/newview/llpaneleditwearable.h')
| -rw-r--r-- | indra/newview/llpaneleditwearable.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h index 43d6a3595f..5a40e945c2 100644 --- a/indra/newview/llpaneleditwearable.h +++ b/indra/newview/llpaneleditwearable.h @@ -135,14 +135,14 @@ private: // localized and parameterized strings that used to build avatar_height_label std::string mMeters; std::string mFeet; - std::string mHeigth; - LLUIString mHeigthValue; + std::string mHeight; + LLUIString mHeightValue; LLUIString mReplacementMetricUrl; - // color for mHeigth string - LLUIColor mAvatarHeigthLabelColor; - // color for mHeigthValue string - LLUIColor mAvatarHeigthValueLabelColor; + // color for mHeight string + LLUIColor mAvatarHeightLabelColor; + // color for mHeightValue string + LLUIColor mAvatarHeightValueLabelColor; // This text editor reference will change each time we edit a new wearable - // it will be grabbed from the currently visible panel |