diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-09-11 10:26:41 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-09-11 10:26:41 -0400 |
commit | 947483cf14bdfcea5e0456fe00662aedfe068809 (patch) | |
tree | ffddb6bc27a2cf1bcc662f28bf1024c80291c997 /indra/newview/llpaneleditwearable.h | |
parent | dc8f2ae2ba1a1348f86f412df7f769e6cc2fe541 (diff) | |
parent | 7b54f077b48740c69559c0a2089b6133ed8eb605 (diff) |
DRTVWR-588: Merge 'DRTVWR-588-maint-W' into DRTVWR-588-cleanup-timers
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 |