From a62a0fc62ce961dd570eefbe37eda51e50310df6 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 13 Aug 2020 19:47:09 +0300 Subject: SL-13149 FIXED URLs copied from MoaP have 6 space characters at the beginning --- indra/newview/llpanelprimmediacontrols.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanelprimmediacontrols.cpp') diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 55c84815aa..6bb213c0ef 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -73,6 +73,8 @@ bool get_hud_matrices(glh::matrix4f &proj, glh::matrix4f &model); const LLPanelPrimMediaControls::EZoomLevel LLPanelPrimMediaControls::kZoomLevels[] = { ZOOM_NONE, ZOOM_MEDIUM }; const int LLPanelPrimMediaControls::kNumZoomLevels = 2; +const S32 ADDR_LEFT_PAD = 3; + // // LLPanelPrimMediaControls // @@ -154,7 +156,7 @@ BOOL LLPanelPrimMediaControls::postBuild() mMediaProgressPanel = getChild("media_progress_indicator"); mMediaProgressBar = getChild("media_progress_bar"); mMediaAddressCtrl = getChild("media_address"); - mMediaAddress = getChild("media_address_url"); + mMediaAddress = getChild("media_address_url"); mMediaPlaySliderPanel = getChild("media_play_position"); mMediaPlaySliderCtrl = getChild("media_play_slider"); mSkipFwdCtrl = getChild("skip_forward"); @@ -498,8 +500,10 @@ void LLPanelPrimMediaControls::updateShape() std::string test_prefix = mCurrentURL.substr(0, prefix.length()); LLStringUtil::toLower(test_prefix); mSecureURL = has_focus && (test_prefix == prefix); - mCurrentURL = (mSecureURL ? " " + mCurrentURL : mCurrentURL); - + + S32 left_pad = mSecureURL ? mSecureLockIcon->getRect().getWidth() : ADDR_LEFT_PAD; + mMediaAddress->setTextPadding(left_pad, 0); + if(mCurrentURL!=mPreviousURL) { setCurrentURL(); -- cgit v1.2.3