From 202d86b15567a783bed55849a7cdc8ad8d8f874f Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 3 Dec 2009 15:39:43 -0500 Subject: EXT-2410 : Accepting an offered item should open the inventorySP Added a new "Quiet" query for folder types, so I don't have to special case all the folders where we don't want UI notifications from inventory offers. Fixed a bug where a sidepanel was considered active even if the sidetray was closed. --HG-- branch : avatar-pipeline --- indra/newview/llsidetray.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llsidetray.cpp') diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 43a3d10634..32f899aa99 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -693,7 +693,7 @@ LLPanel* LLSideTray::getPanel (const std::string& panel_name) LLPanel* LLSideTray::getActivePanel() { - if (mActiveTab) + if (mActiveTab && !mCollapsed) { return mActiveTab->getPanel(); } -- cgit v1.3