diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-03-18 21:06:02 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-03-18 21:06:02 +0200 |
commit | dcb6b5489d2c3cfdb13d5862f8cb29fee06745a7 (patch) | |
tree | a302137ac15519cf689e5fd719400e0875c9391d /indra/newview/llpanelobject.cpp | |
parent | b8aa22d65e714f8b0cf67a5e3c64e1c01b8825f0 (diff) | |
parent | 328329fceab6b18dd7dda6f7ce9a3d4788fd7c54 (diff) |
Merge branch 'master' into DRTVWR-483
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
-rw-r--r-- | indra/newview/llpanelobject.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 3665910c63..6bff95ab36 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -30,7 +30,6 @@ #include "llpanelobject.h" // linden library includes -#include "lleconomy.h" #include "llerror.h" #include "llfontgl.h" #include "llpermissionsflags.h" |