diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-17 12:47:47 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-17 12:47:47 +0200 |
| commit | b53e60b8574eecb583aa3a0902280849f53012ea (patch) | |
| tree | 4ba57cc934b09e4119797606834cfc46805032cf /indra/newview/llbottomtray.cpp | |
| parent | 09a509e0073a1daa5eadf1b5bf5bdef24080ab47 (diff) | |
| parent | 9cfc4c07267234ee4f218d100f7d4f27d6e3e000 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 48c0ec61d8..c9082da9a9 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); } |