diff options
| author | Alain Linden <alain@lindenlab.com> | 2011-01-31 15:55:42 -0800 |
|---|---|---|
| committer | Alain Linden <alain@lindenlab.com> | 2011-01-31 15:55:42 -0800 |
| commit | 48bf6b19b36a3ff3f5b3d440d511a0e3dba3d768 (patch) | |
| tree | 7540cf71c2c9fe04c80debb88ddeaa2a69003bdc | |
| parent | 3a782eb733c4fea3f2f70e3ab368ed1c2188a8a7 (diff) | |
build uses latest jsoncpp package with new layout.
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/cmake/JsonCpp.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/lltranslate.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/autobuild.xml b/autobuild.xml index dc6ccc2817..60ba91d89a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -908,9 +908,9 @@ <key>archive</key> <map> <key>hash</key> - <string>53f1e3ff386daa25ff1e88df4b5c6941</string> + <string>a668a4ddfe20a078d720d7a4fca205bd</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-windows-20110131.tar.bz2</string> + <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-windows-20110131a.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 5d571e734a..27cb22024e 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -18,5 +18,5 @@ else (STANDALONE) elseif (LINUX) set(JSONCPP_LIBRARIES jsoncpp) endif (WINDOWS) - set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) + set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json) endif (STANDALONE) 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="; |