History

Merge branch 'master' of https://github.com/highfidelity/hifi into pull-from-master

howard-stearns committed 10 years ago

Commit df376912 parents e3aae0e e2f7b4421 files · +359 −109Browse files

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

Unified · Split

interface/src/Application.cpp+4−2
@@ -5114,8 +5114,10 @@ void Application::setPreviousScriptLocation(const QString& location) { · 5113 unmodified lines
51145114 }
51155115
51165116 void Application::loadScriptURLDialog() const {
5117− auto newScript = OffscreenUi::getText(nullptr, "Open and Run Script", "Script URL");
5118− if (!newScript.isEmpty()) {
5117+ auto newScript = OffscreenUi::getText(OffscreenUi::ICON_NONE, "Open and Run Script", "Script URL");
5118+ if (QUrl(newScript).scheme() == "atp") {
5119+ OffscreenUi::warning("Error Loading Script", "Cannot load client script over ATP");
5120+ } else if (!newScript.isEmpty()) {
51195121 DependencyManager::get<ScriptEngines>()->loadScript(newScript);
51205122 }
51215123 }