diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-01 12:47:19 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 12:47:19 -0400 |
commit | 2f74cd32791dc9025e1e396b2f535fdfb6b1ca87 (patch) | |
tree | 6d57ab7f0d3ea7717276fca421e98547d52b5124 /indra/newview/lltranslate.cpp | |
parent | 6bee9532207cfabd1c6315ea00fa7703bc401d2c (diff) | |
parent | a03f6997d8c3519e2c89930a1ed03a787af6f7ae (diff) |
merge changes for storm-1130
Diffstat (limited to 'indra/newview/lltranslate.cpp')
-rw-r--r-- | indra/newview/lltranslate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp index 011aa47e31..2de7db38ed 100644 --- a/indra/newview/lltranslate.cpp +++ b/indra/newview/lltranslate.cpp @@ -33,7 +33,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="; |