History

added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting

Seth Alves committed 11 years ago

Commit 2a068161 parent 87ac38c25 files · +167 −103Browse files

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

Unified · Split

interface/src/Application.cpp+1−1
@@ -1786,7 +1786,7 @@ bool Application::importEntities(const QString& urlOrFilename) { · 1785 unmodified lines
17861786 url = QUrl::fromLocalFile(urlOrFilename);
17871787 }
17881788
1789− bool success = _entityClipboard.readFromSVOURL(url.toString());
1789+ bool success = _entityClipboard.readFromURL(url.toString());
17901790 if (success) {
17911791 _entityClipboard.reaverageOctreeElements();
17921792 }

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