diff options
author | callum <none@none> | 2009-12-15 17:53:03 -0800 |
---|---|---|
committer | callum <none@none> | 2009-12-15 17:53:03 -0800 |
commit | b7747a815f1fb7ee49804b6b2daf2e347b27f7a5 (patch) | |
tree | 7edef8c608cc99cb0e657694d259598294858851 /indra/newview/llvoavatar.cpp | |
parent | f923f896bca0d0d8459c35a5ef8e0d0171cbe664 (diff) | |
parent | fc40740e1e5a7fcb1ed8bf3b4b6eaffe7d3d9c07 (diff) |
Merge with tip before push
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 226d85ec99..6e93bf1bf2 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -45,6 +45,7 @@ #include "llaudioengine.h" #include "noise.h" +#include "sound_ids.h" #include "llagent.h" // Get state values from here #include "llagentwearables.h" @@ -64,7 +65,6 @@ #include "llkeyframewalkmotion.h" #include "llmutelist.h" #include "llmoveview.h" -#include "llnotify.h" #include "llquantize.h" #include "llregionhandle.h" #include "llresmgr.h" |