From 06d528fce5687df0b6296aacacdb4d660ec7dec5 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 23 Oct 2014 09:28:48 -0700 Subject: [PATCH 1/3] bump audio version number --- libraries/networking/src/PacketHeaders.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/networking/src/PacketHeaders.cpp b/libraries/networking/src/PacketHeaders.cpp index 7f81a4c59e..8ce379b203 100644 --- a/libraries/networking/src/PacketHeaders.cpp +++ b/libraries/networking/src/PacketHeaders.cpp @@ -53,7 +53,7 @@ PacketVersion versionForPacketType(PacketType type) { case PacketTypeSilentAudioFrame: return 4; case PacketTypeMixedAudio: - return 1; + return 2; case PacketTypeAvatarData: return 3; case PacketTypeAvatarIdentity: From 9364c3b3423696b5af1cfffc007a6c73bd770308 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 23 Oct 2014 11:54:30 -0700 Subject: [PATCH 2/3] fix for delete of last row in array table --- domain-server/resources/web/js/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js index 21a4d99977..a27965abce 100644 --- a/domain-server/resources/web/js/settings.js +++ b/domain-server/resources/web/js/settings.js @@ -529,7 +529,7 @@ function deleteTableRow(delete_glyphicon) { row.html(""); } else { - if (table.find('.' + Settings.DATA_ROW_CLASS).length) { + if (table.find('.' + Settings.DATA_ROW_CLASS).length > 1) { updateDataChangedForSiblingRows(row) // this isn't the last row - we can just remove it From a4965e7f60d5ab1b279126838c325390343f4d39 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Thu, 23 Oct 2014 13:59:08 -0600 Subject: [PATCH 3/3] No need for https when downloading assets --- examples/libraries/globals.js | 2 +- interface/src/ScriptsModel.cpp | 2 +- interface/src/ui/ModelsBrowser.cpp | 2 +- tests/octree/src/ModelTests.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/libraries/globals.js b/examples/libraries/globals.js index 1bd851af77..0c382314c9 100644 --- a/examples/libraries/globals.js +++ b/examples/libraries/globals.js @@ -8,4 +8,4 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -HIFI_PUBLIC_BUCKET = "https://s3.amazonaws.com/hifi-public/"; +HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; diff --git a/interface/src/ScriptsModel.cpp b/interface/src/ScriptsModel.cpp index b95b6ae735..41ce16c229 100644 --- a/interface/src/ScriptsModel.cpp +++ b/interface/src/ScriptsModel.cpp @@ -21,7 +21,7 @@ #include "ScriptsModel.h" -static const QString S3_URL = "https://s3.amazonaws.com/hifi-public"; +static const QString S3_URL = "http://s3.amazonaws.com/hifi-public"; static const QString PUBLIC_URL = "http://public.highfidelity.io"; static const QString MODELS_LOCATION = "scripts/"; diff --git a/interface/src/ui/ModelsBrowser.cpp b/interface/src/ui/ModelsBrowser.cpp index 7a76bc2d7d..a39d9b9a19 100644 --- a/interface/src/ui/ModelsBrowser.cpp +++ b/interface/src/ui/ModelsBrowser.cpp @@ -26,7 +26,7 @@ const char* MODEL_TYPE_NAMES[] = { "entities", "heads", "skeletons", "attachments" }; -static const QString S3_URL = "https://s3.amazonaws.com/hifi-public"; +static const QString S3_URL = "http://s3.amazonaws.com/hifi-public"; static const QString PUBLIC_URL = "http://public.highfidelity.io"; static const QString MODELS_LOCATION = "models/"; diff --git a/tests/octree/src/ModelTests.cpp b/tests/octree/src/ModelTests.cpp index f6bef3e533..3666759de4 100644 --- a/tests/octree/src/ModelTests.cpp +++ b/tests/octree/src/ModelTests.cpp @@ -62,7 +62,7 @@ void EntityTests::entityTreeTests(bool verbose) { properties.setPosition(positionAtCenterInMeters); // TODO: Fix these unit tests. //properties.setRadius(halfMeter); - //properties.setModelURL("https://s3.amazonaws.com/hifi-public/ozan/theater.fbx"); + //properties.setModelURL("http://s3.amazonaws.com/hifi-public/ozan/theater.fbx"); tree.addEntity(entityID, properties); @@ -269,7 +269,7 @@ void EntityTests::entityTreeTests(bool verbose) { // TODO: fix these unit tests //properties.setRadius(halfMeter); - //properties.setModelURL("https://s3.amazonaws.com/hifi-public/ozan/theater.fbx"); + //properties.setModelURL("http://s3.amazonaws.com/hifi-public/ozan/theater.fbx"); if (extraVerbose) { qDebug() << "iteration:" << i