summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-01-17 13:54:39 -0500
committerOz Linden <oz@lindenlab.com>2013-01-17 13:54:39 -0500
commit841dc5da2ef9626fa4ab9255681d217df62a6b0b (patch)
tree2c5bacebcb27b78d318b6e162334488f6e515974 /indra/llmath
parentb7f8a2479249646c7fb38ead195d5197ab733c94 (diff)
parentd16757545c91d4f7dac3c52a311ad0f0239052e1 (diff)
merge up to 3.4.4
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|