summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-09-08 16:48:45 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-09-08 16:48:45 -0400
commitbd058cc1a6a966116e8c9ae85c45f43d3a573d3c (patch)
treefa3c1b04a20a931833cfed28b12d1753a323c25e /indra/newview
parent13f1d6e472ed797a04d2c36cbdeacb505222da50 (diff)
parent4a8d59367a695fedff21a71d35bcad3f729f6060 (diff)
merge
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorybridge.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index ab75b9ef8d..f6b7b41314 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -35,7 +35,7 @@
#include "llagentwearables.h"
#include "llappearancemgr.h"
#include "llattachmentsmgr.h"
-#include "llavataractions.h"
+#include "llavataractions.h"
#include "llfloateropenobject.h"
#include "llfloaterreg.h"
#include "llfloaterworldmap.h"