diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-03-18 21:05:33 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-03-18 21:05:33 +0200 |
commit | 9ec2aac56c0e1a60ad8dbf6549b8a3cf7efec570 (patch) | |
tree | 2970dc78d6fb7272e70c296188b0b45d653060c8 /indra/newview/llfloatermodelpreview.cpp | |
parent | e66e31f380563962429c8b285f1aa5dabf8ea5d2 (diff) | |
parent | 328329fceab6b18dd7dda6f7ce9a3d4788fd7c54 (diff) |
Merge branch 'master' into DRTVWR-482
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
-rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 10db8ac3bc..e694340b16 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -44,7 +44,6 @@ #include "lldrawable.h" #include "llrender.h" #include "llface.h" -#include "lleconomy.h" #include "llfocusmgr.h" #include "llfloaterperms.h" #include "lliconctrl.h" |