diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-03 15:39:43 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-03 15:39:43 -0500 |
| commit | 202d86b15567a783bed55849a7cdc8ad8d8f874f (patch) | |
| tree | b334bca174ada4367d100223fb2fba57c40a4847 /indra/newview/llsidetray.cpp | |
| parent | e23d51700733e98f966c540602038686cba98d4e (diff) | |
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
Diffstat (limited to 'indra/newview/llsidetray.cpp')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); } |