diff options
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 1a51b96fdf..1b213c3418 100755 --- a/indra/llui/llfocusmgr.cpp +++ b/indra/llui/llfocusmgr.cpp @@ -186,7 +186,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;  	}  | 
