summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llcharacter.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2014-01-09 12:22:24 -0800
committerRichard Linden <none@none>2014-01-09 12:22:24 -0800
commit15e6939342956f830996299352bcf7fffa7c3b85 (patch)
treedcd6443f049d35b3f3401d768b1eab735eda363b /indra/llcharacter/llcharacter.h
parentd8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff)
parent1d0d485b69bbbfd63d2d56a795d818131db2667c (diff)
merge with release
Diffstat (limited to 'indra/llcharacter/llcharacter.h')
-rwxr-xr-xindra/llcharacter/llcharacter.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h
index 5740dbce77..b10a8a5f34 100755
--- a/indra/llcharacter/llcharacter.h
+++ b/indra/llcharacter/llcharacter.h
@@ -35,9 +35,9 @@
#include "lljoint.h"
#include "llmotioncontroller.h"
#include "llvisualparam.h"
-#include "string_table.h"
+#include "llstringtable.h"
#include "llpointer.h"
-#include "llthread.h"
+#include "llrefcount.h"
class LLPolyMesh;