Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 11:42:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3839 from birarda/master

Browse source 
trim whitespace for place name lookup, potential lobby crash fix
This commit is contained in:
Brad Hefta-Gaub 2014-11-20 09:57:39 -08:00
commit 32f60c4255
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
examples/lobby.js
View file

@ -171,17 +171,6 @@ function playRandomMusak() {
} }
function cleanupLobby() { 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(panelWall);
Overlays.deleteOverlay(orbShell); Overlays.deleteOverlay(orbShell);

2
libraries/networking/src/AddressManager.cpp
View file

@ -131,7 +131,7 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl) {
void AddressManager::handleLookupString(const QString& lookupString) { void AddressManager::handleLookupString(const QString& lookupString) {
if (!lookupString.isEmpty()) { if (!lookupString.isEmpty()) {
// make this a valid hifi URL and handle it off to handleUrl // make this a valid hifi URL and handle it off to handleUrl
QString sanitizedString = lookupString; QString sanitizedString = lookupString.trimmed();
QUrl lookupURL; QUrl lookupURL;
if (!lookupString.startsWith('/')) { if (!lookupString.startsWith('/')) {