From d2ef287e9c62dbf179ba624e60b882cfc59bb8ca Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 16 Feb 2010 16:38:16 +0000
Subject: [PATCH] defensiveness added to 81fc7fe78ca6 / EXT-5376
---
indra/newview/llbottomtray.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 2958565fdf..95a946cee8 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -64,7 +64,8 @@ namespace
S32 get_panel_min_width(LLLayoutStack* stack, LLPanel* panel)
{
S32 minimal_width = 0;
- if ( panel && panel->getVisible() )
+ llassert(stack);
+ if ( stack && panel && panel->getVisible() )
{
stack->getPanelMinSize(panel->getName(), &minimal_width, NULL);
}
--
GitLab