From 1aa98dfc4c03f242acfe620e6a5d78dd1c14b3b6 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 20 Nov 2014 09:24:43 -0800 Subject: [PATCH 1/2] trim whitespace for place name lookup --- libraries/networking/src/AddressManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index 6113cadb06..81b3a1328b 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -131,7 +131,7 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl) { void AddressManager::handleLookupString(const QString& lookupString) { if (!lookupString.isEmpty()) { // make this a valid hifi URL and handle it off to handleUrl - QString sanitizedString = lookupString; + QString sanitizedString = lookupString.trimmed(); QUrl lookupURL; if (!lookupString.startsWith('/')) { From f3b5102969ab3daa6cdd5d8ae9650be7d8a452b8 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 20 Nov 2014 09:38:41 -0800 Subject: [PATCH 2/2] remove texture replace fix to avoid a crash --- examples/lobby.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/examples/lobby.js b/examples/lobby.js index 437cfe40f3..7b89ab02a9 100644 --- a/examples/lobby.js +++ b/examples/lobby.js @@ -171,17 +171,6 @@ function playRandomMusak() { } function cleanupLobby() { - - // for each of the 21 placeholder textures, set them back to default so the cached model doesn't have changed textures - var panelTexturesReset = {}; - panelTexturesReset["textures"] = {}; - - for (var j = 0; j < MAX_NUM_PANELS; j++) { - panelTexturesReset["textures"]["file" + (j + 1)] = HIFI_PUBLIC_BUCKET + "models/sets/Lobby/LobbyPrototype/Texture.jpg"; - }; - - Overlays.editOverlay(panelWall, panelTexturesReset); - Overlays.deleteOverlay(panelWall); Overlays.deleteOverlay(orbShell);