diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-05-06 22:13:40 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-05-06 22:13:40 +0300 |
| commit | f655bb1f27fa637ef1889f8bb83bb0d74d645059 (patch) | |
| tree | 9992f73059230cf04c8f0b9206fac306f23c8db3 /indra/newview/llpanelprimmediacontrols.h | |
| parent | 0bf68ce7363dc9114000a6a5a40de87f79b28f37 (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Merge branch master (DRTVWR-515) into DRTVWR-483
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llpanelpicks.cpp (was replaced with a tab in floater)
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.h')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h index 86fc036553..dd0e4ff095 100644 --- a/indra/newview/llpanelprimmediacontrols.h +++ b/indra/newview/llpanelprimmediacontrols.h @@ -39,6 +39,7 @@ class LLProgressBar; class LLSliderCtrl; class LLViewerMediaImpl; class LLWindowShade; +class LLLineEditor; class LLPanelPrimMediaControls : public LLPanel { @@ -164,7 +165,7 @@ private: LLPanel *mMediaProgressPanel; LLProgressBar *mMediaProgressBar; LLUICtrl *mMediaAddressCtrl; - LLUICtrl *mMediaAddress; + LLLineEditor *mMediaAddress; LLUICtrl *mMediaPlaySliderPanel; LLUICtrl *mMediaPlaySliderCtrl; LLUICtrl *mVolumeCtrl; |