diff options
author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-12-11 19:58:08 +0200 |
---|---|---|
committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-12-11 19:58:08 +0200 |
commit | 6a02f5bbcec2b1a530ceeacb0dc564cfeb7cbc7f (patch) | |
tree | 0a811059e4982105c4fb506241b94e61602fb8e4 /indra/llui | |
parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) |
Initial version of Visual Outfit Browser
Diffstat (limited to 'indra/llui')
-rwxr-xr-x | indra/llui/llfocusmgr.cpp | 1 | ||||
-rwxr-xr-x | indra/llui/lllayoutstack.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp index 547f0bd398..87c50ad465 100755 --- a/indra/llui/llfocusmgr.cpp +++ b/indra/llui/llfocusmgr.cpp @@ -168,7 +168,6 @@ void LLFocusMgr::releaseFocusIfNeeded( LLView* view ) LLUI::removePopup(view); } - void LLFocusMgr::setKeyboardFocus(LLFocusableElement* new_focus, BOOL lock, BOOL keystrokes_only) { // notes if keyboard focus is changed again (by onFocusLost/onFocusReceived) diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 69246a2f57..11769760aa 100755 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -283,7 +283,7 @@ void LLLayoutStack::removeChild(LLView* view) if (embedded_panelp) { mPanels.erase(std::find(mPanels.begin(), mPanels.end(), embedded_panelp)); - delete embedded_panelp; + //delete embedded_panelp; updateFractionalSizes(); mNeedsLayout = true; } |