summaryrefslogtreecommitdiff
path: root/indra/llui/lltexteditor.h
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2014-05-07 11:14:26 -0700
committerdolphin <dolphin@lindenlab.com>2014-05-07 11:14:26 -0700
commit48fece44737fa8b9614fd864354d9287a216ea33 (patch)
treef68426d79f4631c6b49be142a92e59086870fa38 /indra/llui/lltexteditor.h
parentae856ef31830912cec0f4de37167858a24e4ba30 (diff)
parentd0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff)
Merge with 3.7.7-release
Diffstat (limited to 'indra/llui/lltexteditor.h')
-rwxr-xr-xindra/llui/lltexteditor.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index d3b7bc0eb7..3a96d8ed24 100755
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -32,10 +32,8 @@
#include "llrect.h"
#include "llkeywords.h"
#include "llframetimer.h"
-#include "lldarray.h"
#include "llstyle.h"
#include "lleditmenuhandler.h"
-#include "lldarray.h"
#include "llviewborder.h" // for params
#include "lltextbase.h"
#include "lltextvalidate.h"