mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop

Browse Source 
Conflicts:
	data/scene/default.scene
This commit is contained in:
Alexander Bock
2016-06-04 19:06:54 +02:00
parent 2700ef6ea8 4ae4ecca3c
commit 4409003524
45 changed files with 2408 additions and 2452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/openspace/engine/downloadmanager.h
View File

@@ -94,11 +94,6 @@ public:
DownloadProgressCallback progressCallback = DownloadProgressCallback()
);
std::shared_ptr<FileFuture> downloadToMemory(
const std::string& url, std::string& memoryBuffer,
DownloadFinishedCallback finishedCallback = DownloadFinishedCallback()
);
std::future<MemoryFile> fetchFile(
const std::string& url,
SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback());