summaryrefslogtreecommitdiff
path: root/indra/llui/llview.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2014-03-11 11:13:16 -0700
committersimon <none@none>2014-03-11 11:13:16 -0700
commitcf2a180823e4e6daa0649ab54a5f7ed6ba14dbb2 (patch)
tree58d360f3ed849ddccae91b139b246318a1648c52 /indra/llui/llview.cpp
parent2ae011dc5ce8b2112c65757ac85e0567165975cf (diff)
parentc7aad1f7e3f643706d714b4426070174abc95145 (diff)
Merge downstream code with 3.7.3 and new version number
Diffstat (limited to 'indra/llui/llview.cpp')
-rwxr-xr-xindra/llui/llview.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 7494814898..5ee2169b66 100755
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -150,14 +150,10 @@ LLView::LLView(const LLView::Params& p)
LLView::~LLView()
{
- //LL_INFOS("Baker") << "[3555] ~LLView -- " << mName << ":" << (void*) this << " ----------------------" << LL_ENDL;
-
dirtyRect();
//llinfos << "Deleting view " << mName << ":" << (void*) this << llendl;
if (LLView::sIsDrawing)
{
- LL_INFOS("Baker") << "[3555] ~LLView() - Deleting view " << mName << " during UI draw() phase" << LL_ENDL;
-
lldebugs << "Deleting view " << mName << " during UI draw() phase" << llendl;
}
// llassert(LLView::sIsDrawing == FALSE);
@@ -167,7 +163,6 @@ LLView::~LLView()
if( hasMouseCapture() )
{
//llwarns << "View holding mouse capture deleted: " << getName() << ". Mouse capture removed." << llendl;
- LL_DEBUGS("Baker") << "[3555] ~LLView() - View holding mouse capture deleted: " << getName() << ". Mouse capture removed." << LL_ENDL;
gFocusMgr.removeMouseCaptureWithoutCallback( this );
}
@@ -175,7 +170,6 @@ LLView::~LLView()
if (mParentView != NULL)
{
- // LL_INFOS("Baker") << "[3555] ~LLView() - Removing this child view" << LL_ENDL;
mParentView->removeChild(this);
}
@@ -184,8 +178,6 @@ LLView::~LLView()
delete mDefaultWidgets;
mDefaultWidgets = NULL;
}
-
- //LL_INFOS("Baker") << "[3555] Exiting ~LLView() " << (void*) this << LL_ENDL;
}
// virtual