diff options
| author | simon <none@none> | 2014-03-11 10:41:52 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-03-11 10:41:52 -0700 |
| commit | c7aad1f7e3f643706d714b4426070174abc95145 (patch) | |
| tree | aefbe573a6bf0deb3278840b3078ebd3368ef63a /indra/llui/lluictrl.cpp | |
| parent | 8b28593c107145af24f860b3f8d55568987ac6c0 (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Merge downstream code to 3.7.4
Diffstat (limited to 'indra/llui/lluictrl.cpp')
| -rwxr-xr-x | indra/llui/lluictrl.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index cfb17c14ba..1722bf27bd 100755 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -207,13 +207,10 @@ void LLUICtrl::initFromParams(const Params& p) LLUICtrl::~LLUICtrl() { - //LL_INFOS("Baker") << "[3555] ~LLUICtrl() -- " << getName() << ":" << (void*) this << " ----------------------" << LL_ENDL; - gFocusMgr.releaseFocusIfNeeded( this ); // calls onCommit() if( gFocusMgr.getTopCtrl() == this ) { - //llinfos << "[3555] ~LLUICtrl() - UI Control holding top ctrl deleted: " << getName() << ". Top view removed." << llendl; llwarns << "UI Control holding top ctrl deleted: " << getName() << ". Top view removed." << llendl; gFocusMgr.removeTopCtrlWithoutCallback( this ); } @@ -227,8 +224,6 @@ LLUICtrl::~LLUICtrl() delete mRightMouseDownSignal; delete mRightMouseUpSignal; delete mDoubleClickSignal; - - //LL_INFOS("Baker") << "[3555] Exiting ~LLUICtrl()" << LL_ENDL; } void default_commit_handler(LLUICtrl* ctrl, const LLSD& param) |