summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAlain Linden <alain@lindenlab.com>2011-01-31 15:56:40 -0800
committerAlain Linden <alain@lindenlab.com>2011-01-31 15:56:40 -0800
commit3f78394f42ecf1f41edd926e0d1ba87c793330ae (patch)
tree94717af239ef405bf5154eb723aac5c8416a8939 /indra/newview
parent8adcaa147de9e8dabaf6e64fbd8af0ccc61c4519 (diff)
parent48bf6b19b36a3ff3f5b3d440d511a0e3dba3d768 (diff)
Automated merge with https://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 8ccfdb071b..7731a98778 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -39,7 +39,7 @@
#include "llversioninfo.h"
#include "llviewercontrol.h"
-#include "jsoncpp/reader.h"
+#include "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=";