diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-04-22 15:34:58 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-04-22 15:34:58 +0100 |
| commit | 4e75814b44e0a2903e351c0bf6e42a7eae086309 (patch) | |
| tree | e473712e3d32d12bb8b35752229a81067d7830e8 /indra/newview/lllocationinputctrl.cpp | |
| parent | 6219348652846782fe682e13aacd00e5225b35d0 (diff) | |
| parent | d7f1c88c35849e56f5b352f13c16a08467d1533b (diff) | |
Merge remote-tracking branch 'origin/master' into SL-12995
Merge
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index 802e4941e6..fd418afd2c 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -44,7 +44,6 @@ // newview includes #include "llagent.h" -#include "llenvmanager.h" #include "llfloatersidepanelcontainer.h" #include "llinventoryobserver.h" #include "lllandmarkactions.h" |