diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-05-12 17:08:20 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-05-12 17:08:20 -0700 |
| commit | f7a01d7b338bcd9c7ee09022a6179b3c6710237d (patch) | |
| tree | ff8b8f6b741d3b016570ef3f5809ae45ca270493 /indra/newview/llvoavatar.cpp | |
| parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
| parent | 2661a4c2c9359f2c2cabce6f48704dc8fb481994 (diff) | |
Merge.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index f1934933b5..79866dc5d2 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -38,9 +38,9 @@ #include <ctype.h> #include "llaudioengine.h" -#include "llcachename.h" #include "noise.h" #include "sound_ids.h" +#include "raytrace.h" #include "llagent.h" // Get state values from here #include "llagentcamera.h" |