From 8ebf34e93fed02bb5771cb0ec2d5e137eec3a828 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 6 Aug 2015 15:15:11 -0700
Subject: [PATCH 1/2] Fix BillboardOverlay breaking when changing url

---
 interface/src/ui/overlays/BillboardOverlay.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/src/ui/overlays/BillboardOverlay.cpp b/interface/src/ui/overlays/BillboardOverlay.cpp
index 58790c4722..9f1ffd619b 100644
--- a/interface/src/ui/overlays/BillboardOverlay.cpp
+++ b/interface/src/ui/overlays/BillboardOverlay.cpp
@@ -53,12 +53,12 @@ void BillboardOverlay::update(float deltatime) {
 }
 
 void BillboardOverlay::render(RenderArgs* args) {
-    if (!_texture) {
+    if (!_isLoaded) {
         _isLoaded = true;
         _texture = DependencyManager::get<TextureCache>()->getTexture(_url);
     }
 
-    if (!_visible || !_texture || !_texture->isLoaded()) {
+    if (!_visible || !_texture->isLoaded()) {
         return;
     }
 

From dd2c0be2d292a6a78875d180ae538beefdf21063 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 6 Aug 2015 15:43:02 -0700
Subject: [PATCH 2/2] Add check in BillboardOverlay::render to make sure
 _texture is valid

---
 interface/src/ui/overlays/BillboardOverlay.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/ui/overlays/BillboardOverlay.cpp b/interface/src/ui/overlays/BillboardOverlay.cpp
index 9f1ffd619b..891969e86b 100644
--- a/interface/src/ui/overlays/BillboardOverlay.cpp
+++ b/interface/src/ui/overlays/BillboardOverlay.cpp
@@ -58,7 +58,7 @@ void BillboardOverlay::render(RenderArgs* args) {
         _texture = DependencyManager::get<TextureCache>()->getTexture(_url);
     }
 
-    if (!_visible || !_texture->isLoaded()) {
+    if (!_visible || !_texture || !_texture->isLoaded()) {
         return;
     }