summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-24 22:23:13 -0500
committerOz Linden <oz@lindenlab.com>2011-02-24 22:23:13 -0500
commit2e7461277801dc0daa1e9ea509e079c980045f42 (patch)
treea514c1787cb8988b0b63c25beea1816ed5e5113f /indra/newview
parent7aca14a77a706f12c22540f7f3a36ec4ee8d8402 (diff)
parent2d268422deb1846da889e38100eae60b42c4d21c (diff)
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lltranslate.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index 7731a98778..c777e15523 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -39,7 +39,7 @@
#include "llversioninfo.h"
#include "llviewercontrol.h"
-#include "reader.h"
+#include "json/reader.h"
// These two are concatenated with the language specifiers to form a complete Google Translate URL
const char* LLTranslate::m_GoogleURL = "http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=";