diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-11-13 13:59:36 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-11-13 13:59:36 +0000 |
| commit | e3de5de3c1374de3829e21d67bc93cfcf9eea848 (patch) | |
| tree | 8236679e2324f02bd0e2f204ea93fce5baef1e45 /indra/newview/llchatbar.cpp | |
| parent | c79e648aac9bb32cc1d49d39973b5e96f25828f0 (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge remote-tracking branch 'origin/master' into DRTVWR-517
Diffstat (limited to 'indra/newview/llchatbar.cpp')
| -rw-r--r-- | indra/newview/llchatbar.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp index 54c6c985d6..3ab5c669c4 100644 --- a/indra/newview/llchatbar.cpp +++ b/indra/newview/llchatbar.cpp @@ -57,7 +57,6 @@ #include "llinventorymodel.h" #include "llmultigesture.h" #include "llui.h" -#include "llviewermenu.h" #include "lluictrlfactory.h" // |