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
63#include <UUID.h>63#include <UUID.h>
64#include <OctreeSceneStats.h>64#include <OctreeSceneStats.h>
65#include <LocalVoxelsList.h>65#include <LocalVoxelsList.h>
66#include <FstReader.h>66#include <ModelUploader.h>
67 67
68#include "Application.h"68#include "Application.h"
69#include "InterfaceVersion.h"69#include "InterfaceVersion.h"
@@ -3247,9 +3247,9 @@ void Application::toggleRunningScriptsWidget() · 3177 unmodified lines
3247}3247}
3248 3248
3249void Application::uploadFST(bool isHead) {3249void Application::uploadFST(bool isHead) {
3250 FstReader reader(isHead);3250 ModelUploader* uploader = new ModelUploader(isHead);
3251 if (reader.zip()) {3251 if (uploader->zip()) {
3252 reader.send();3252 uploader->send();
3253 }3253 }
3254}3254}
3255 3255

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