From f5fdc9e28f6ba35683c632875a0999415a821783 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 25 Apr 2016 09:53:41 -0700 Subject: [PATCH 1/2] change link on Sandbox splash screen --- server-console/src/splash.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-console/src/splash.html b/server-console/src/splash.html index b9947bcbaa..d93b742181 100644 --- a/server-console/src/splash.html +++ b/server-console/src/splash.html @@ -28,7 +28,7 @@ You can make your home yours by uploading your own models and scripts.

- To see how, check out 'The Basics' + To get started exploring and creating, check out our Quick-start Guide

From 49566c8f261a635e3fadf7880823a2e01b1e2293 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 25 Apr 2016 10:07:08 -0700 Subject: [PATCH 2/2] fix memory leak in AssetMappingModel --- interface/src/scripting/AssetMappingsScriptingInterface.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/src/scripting/AssetMappingsScriptingInterface.cpp b/interface/src/scripting/AssetMappingsScriptingInterface.cpp index 3f11bd1fd8..965b3a9e0c 100644 --- a/interface/src/scripting/AssetMappingsScriptingInterface.cpp +++ b/interface/src/scripting/AssetMappingsScriptingInterface.cpp @@ -292,6 +292,8 @@ void AssetMappingModel::refresh() { } else { emit errorGettingMappings(request->getErrorString()); } + + request->deleteLater(); }); request->start();