diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-11 22:45:54 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-11 22:45:54 +0200 |
| commit | b9bcfad195f357d6bf1309155de99b6b6a41e4a3 (patch) | |
| tree | 0afad84d0c401e0232066dbb7ce8698b437f3eac /indra/newview/llavatariconctrl.h | |
| parent | 5355d9a2fe148561613b801c957aaa155f742110 (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' into DRTVWR-520-apple-notarization
Diffstat (limited to 'indra/newview/llavatariconctrl.h')
| -rw-r--r-- | indra/newview/llavatariconctrl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llavatariconctrl.h b/indra/newview/llavatariconctrl.h index a1dacd1a27..c510e86958 100644 --- a/indra/newview/llavatariconctrl.h +++ b/indra/newview/llavatariconctrl.h @@ -31,7 +31,6 @@ #include "lliconctrl.h" #include "llavatarpropertiesprocessor.h" -#include "llviewermenu.h" class LLAvatarName; |