From 722ddc5d3a08ccee57ddebd9e423eaf032cf90c0 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 28 Jul 2015 13:55:05 +0200 Subject: [PATCH] Don't try to download removed scriptlibrary_lsl.xml via FSData --- indra/newview/fsdata.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp index 8a867e8b23..93799e366b 100644 --- a/indra/newview/fsdata.cpp +++ b/indra/newview/fsdata.cpp @@ -141,8 +141,7 @@ public: return; } - U8* data = NULL; - data = new U8[data_size]; + U8* data = new U8[data_size]; buffer->readAfter(channels.in(), NULL, data, data_size); // basic check for valid data received @@ -345,10 +344,7 @@ void FSData::startDownload() LLHTTPClient::getIfModified(mFSdataDefaultsUrl, new FSDownloader(mFSdataDefaultsUrl), last_modified, mHeaders, HTTP_TIMEOUT); #if OPENSIM - std::string filenames[] = {"scriptlibrary_lsl.xml", "scriptlibrary_ossl.xml", "scriptlibrary_aa.xml"}; -#else - std::string filenames[] = {"scriptlibrary_lsl.xml"}; -#endif + std::string filenames[] = {"scriptlibrary_ossl.xml", "scriptlibrary_aa.xml"}; BOOST_FOREACH(std::string script_name, filenames) { filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, script_name); @@ -361,6 +357,7 @@ void FSData::startDownload() LL_INFOS("fsdata") << "Downloading " << script_name << " from " << url << " with last modifed of " << last_modified << LL_ENDL; LLHTTPClient::getIfModified(url, new FSDownloaderScript(filename, url), last_modified, mHeaders, HTTP_TIMEOUT); } +#endif } // call this _after_ the login screen to pick up grid data. @@ -376,7 +373,7 @@ void FSData::downloadAgents() if (!LLGridManager::getInstance()->isInSecondLife()) { // TODO: Let the opensim devs and opensim group figure out the best way - // to add "agents.xml" URL to the gridinfo protucule. + // to add "agents.xml" URL to the gridinfo protocol. //getAgentsURL(); // there is no need for assets.xml URL for opensim grids as the grid owner can just delete