Merged in branch develop to feature/globebrowsing

This commit is contained in:
Erik Broberg
2016-04-18 20:02:42 -04:00
391 changed files with 20596 additions and 13544 deletions

View File

@@ -112,7 +112,7 @@ namespace openspace {
OnTileDownloaded onTileDownloaded(tileIndex.hashKey(), &_tileCache);
DownloadManager::FileFuture* ff = DownloadManager::ref().downloadFile(twmsRequestUrl, localTileFile, overrideFile, onTileDownloaded);
std::shared_ptr<DownloadManager::FileFuture> ff = DownloadManager::ref().downloadFile(twmsRequestUrl, localTileFile, overrideFile, onTileDownloaded);
}