diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2022-08-31 12:04:10 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2022-08-31 12:04:10 -0400 |
commit | 13456d01a71b873ed59e3839f817434357fc8da5 (patch) | |
tree | 43242564df171301b7518e2e41b0d81a144ec05d /indra/newview/llwebprofile.cpp | |
parent | 96ec4b3a54268416e59fe68e597e5aea4579bd44 (diff) | |
parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) |
DRTVWR-568: Merge branch 'master' into fix-monterey for D483 release.
Diffstat (limited to 'indra/newview/llwebprofile.cpp')
-rw-r--r-- | indra/newview/llwebprofile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llwebprofile.cpp b/indra/newview/llwebprofile.cpp index ff899fe895..3cc82621c4 100644 --- a/indra/newview/llwebprofile.cpp +++ b/indra/newview/llwebprofile.cpp @@ -36,7 +36,7 @@ #include "llstring.h" // newview -#include "llpanelprofile.h" // for getProfileURL(). FIXME: move the method to LLAvatarActions +#include "llavataractions.h" // for getProfileURL() #include "llviewermedia.h" // FIXME: don't use LLViewerMedia internals #include "llcorehttputil.h" |