diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-18 19:16:03 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-18 19:16:03 +0300 |
| commit | cfe0ba90352c48a2b9f5006c4c8e824dc472cdc9 (patch) | |
| tree | 58515df5648b7a7819b4cb62e88431c1b4747e79 /indra/llxml/llcontrol.h | |
| parent | 61e318564e5c492ff7da70ef05f9596c4af8d369 (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
# indra/newview/llimprocessing.cpp
Diffstat (limited to 'indra/llxml/llcontrol.h')
| -rw-r--r-- | indra/llxml/llcontrol.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index 6e6004cdb2..99946607f4 100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -34,8 +34,6 @@ #include "llrefcount.h" #include "llinstancetracker.h" -#include "llcontrolgroupreader.h" - #include <vector> // *NOTE: boost::visit_each<> generates warning 4675 on .net 2003 |