History

Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels

Andrzej Kapolka committed 12 years ago

Commit 550a8fd2 parents a0c7e4d a5700203 files · +50 −22Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

interface/src/Application.cpp+4−4
@@ -63,7 +63,7 @@ · 62 unmodified lines
6363 #include <UUID.h>
6464 #include <OctreeSceneStats.h>
6565 #include <LocalVoxelsList.h>
66−#include <FstReader.h>
66+#include <ModelUploader.h>
6767
6868 #include "Application.h"
6969 #include "InterfaceVersion.h"
@@ -3247,9 +3247,9 @@ void Application::toggleRunningScriptsWidget() · 3177 unmodified lines
32473247 }
32483248
32493249 void Application::uploadFST(bool isHead) {
3250− FstReader reader(isHead);
3251− if (reader.zip()) {
3252− reader.send();
3250+ ModelUploader* uploader = new ModelUploader(isHead);
3251+ if (uploader->zip()) {
3252+ uploader->send();
32533253 }
32543254 }
32553255

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t