summaryrefslogtreecommitdiff
path: root/indra/llaudio
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-09-08 15:46:29 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-09-08 15:46:29 -0400
commitac62e322ce0060758afca2007469dd25a3d64d48 (patch)
treec86f24d832bb5c5006c5dc95a28e59d1dbdc4c1f /indra/llaudio
parentee4cd594623eff6f04cfc2bafb937f0cfd631080 (diff)
parentbff5a4e7940d40576f52105ab9877f5a6b7d85c8 (diff)
Merge. Refresh from viewer-drano-http-4 after 3.7.15 release.
Diffstat (limited to 'indra/llaudio')
-rwxr-xr-xindra/llaudio/llaudiodecodemgr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llaudio/llaudiodecodemgr.h b/indra/llaudio/llaudiodecodemgr.h
index 7a9b807d04..8228e20e8c 100755
--- a/indra/llaudio/llaudiodecodemgr.h
+++ b/indra/llaudio/llaudiodecodemgr.h
@@ -24,7 +24,7 @@
*/
#ifndef LL_LLAUDIODECODEMGR_H
-#define LL_LLAUDIODECODEMG_H
+#define LL_LLAUDIODECODEMGR_H
#include "stdtypes.h"