diff options
author | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
commit | 2a4dea528f670b9bb1f77ef27a8a1dd16603d114 (patch) | |
tree | 95c68e362703c9099d571ecbdc6142b1cda1e005 /linden/indra/newview/llfolderview.cpp | |
parent | Second Life viewer sources 1.20.6 (diff) | |
download | meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.zip meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.gz meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.bz2 meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.xz |
Second Life viewer sources 1.20.7
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfolderview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp index 49ca5e4..b543e31 100644 --- a/linden/indra/newview/llfolderview.cpp +++ b/linden/indra/newview/llfolderview.cpp | |||
@@ -40,7 +40,7 @@ | |||
40 | #include "llfocusmgr.h" | 40 | #include "llfocusmgr.h" |
41 | #include "llfontgl.h" | 41 | #include "llfontgl.h" |
42 | #include "llgl.h" | 42 | #include "llgl.h" |
43 | #include "llglimmediate.h" | 43 | #include "llrender.h" |
44 | #include "llinventory.h" | 44 | #include "llinventory.h" |
45 | 45 | ||
46 | #include "llcallbacklist.h" | 46 | #include "llcallbacklist.h" |
@@ -3144,6 +3144,10 @@ void LLFolderView::draw() | |||
3144 | { | 3144 | { |
3145 | closeAutoOpenedFolders(); | 3145 | closeAutoOpenedFolders(); |
3146 | } | 3146 | } |
3147 | if(gViewerWindow->hasKeyboardFocus(this) && !getVisible()) | ||
3148 | { | ||
3149 | gViewerWindow->setKeyboardFocus( NULL ); | ||
3150 | } | ||
3147 | 3151 | ||
3148 | // while dragging, update selection rendering to reflect single/multi drag status | 3152 | // while dragging, update selection rendering to reflect single/multi drag status |
3149 | if (LLToolDragAndDrop::getInstance()->hasMouseCapture()) | 3153 | if (LLToolDragAndDrop::getInstance()->hasMouseCapture()) |