diff options
author | Callum Prentice <callum@lindenlab.com> | 2021-03-09 14:39:51 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2021-03-09 14:39:51 -0800 |
commit | 168d177197bd7558bbe0ca13d01c984ad8638da7 (patch) | |
tree | 60b01576041b1d1e336fef9c4944570c2c4dfcc4 /indra/llui/llviewereventrecorder.h | |
parent | 519cbcecdf78e4dfc3adc465ae8cebed5df71647 (diff) |
This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
Diffstat (limited to 'indra/llui/llviewereventrecorder.h')
-rw-r--r-- | indra/llui/llviewereventrecorder.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/llviewereventrecorder.h b/indra/llui/llviewereventrecorder.h index d1059d55de..94e66f5dc4 100644 --- a/indra/llui/llviewereventrecorder.h +++ b/indra/llui/llviewereventrecorder.h @@ -32,7 +32,6 @@ #include "lldir.h" #include "llsd.h" #include "llfile.h" -#include "llvfile.h" #include "lldate.h" #include "llsdserialize.h" #include "llkeyboard.h" |