From 5cc44523f79b6cf495d2649fce9bf9e5181787e8 Mon Sep 17 00:00:00 2001 From: Aaron Brashears Date: Fri, 9 Feb 2007 23:35:12 +0000 Subject: Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release. --- indra/newview/llpanelpick.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelpick.cpp') diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp index 6c5dcc1f45..ab2a298a06 100644 --- a/indra/newview/llpanelpick.cpp +++ b/indra/newview/llpanelpick.cpp @@ -488,7 +488,7 @@ void LLPanelPick::onCommitAny(LLUICtrl* ctrl, void* data) else {*/ LLTabContainerVertical* tab = (LLTabContainerVertical*)self->getParent(); - tab->setCurrentTabName(self->mNameEditor->getText()); + if(tab) tab->setCurrentTabName(self->mNameEditor->getText()); //} } } -- cgit v1.3