diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2022-11-02 12:20:05 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2022-11-02 12:20:05 -0400 |
commit | 7b35b7baea861ae58cd01826bb57fe995dc8aa52 (patch) | |
tree | d73198b7a3f55a3644f8b0faf60a0283d5a81f17 /indra/newview/llfloaterurlentry.cpp | |
parent | 13456d01a71b873ed59e3839f817434357fc8da5 (diff) | |
parent | 15b5dedb2dc139c85461e7c867164b65cc6fc628 (diff) |
DRTVWR-575: Merge branch 'master' into fix-monterey
Diffstat (limited to 'indra/newview/llfloaterurlentry.cpp')
-rw-r--r-- | indra/newview/llfloaterurlentry.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp index d5c2ad5f81..917d6dfcd0 100644 --- a/indra/newview/llfloaterurlentry.cpp +++ b/indra/newview/llfloaterurlentry.cpp @@ -112,16 +112,6 @@ void LLFloaterURLEntry::headerFetchComplete(S32 status, const std::string& mime_ panel_media->setMediaType(mime_type); panel_media->setMediaURL(mMediaURLEdit->getValue().asString()); } - else - { - LLPanelFace* panel_face = dynamic_cast<LLPanelFace*>(mPanelLandMediaHandle.get()); - if(panel_face) - { - panel_face->setMediaType(mime_type); - panel_face->setMediaURL(mMediaURLEdit->getValue().asString()); - } - - } getChildView("loading_label")->setVisible( false); closeFloater(); |