summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-11-06 16:37:51 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-11-06 16:37:51 -0500
commit55a812ca7797ec1b857e95254fde1fa75bd92d06 (patch)
treec15fdb992af40162cc5adb3c25257f3ba1f069a1 /indra/llmath
parentbf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff)
parenta9ea41003587e2411c7247f84ea04df2a686552b (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/v3color.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmath/v3color.h b/indra/llmath/v3color.h
index 56cb2ae73e..daf3a6857b 100644
--- a/indra/llmath/v3color.h
+++ b/indra/llmath/v3color.h
@@ -33,6 +33,7 @@ class LLVector4;
#include "llerror.h"
#include "llmath.h"
#include "llsd.h"
+#include <string.h>
// LLColor3 = |r g b|