summaryrefslogtreecommitdiff
path: root/indra/llui/llview.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2014-02-25 16:59:46 -0800
committersimon <none@none>2014-02-25 16:59:46 -0800
commit43e36b7ee328f49149292f27cc5621238d03ac26 (patch)
tree2d46556a050699dee527e0ebbf82260e27bae793 /indra/llui/llview.cpp
parent5705a2c0181a9376db5eadf6ccf97e0675f6afb5 (diff)
parentdd8b32473e652c2d3193c78db21b06ba25e28b67 (diff)
Merge downstream code
Diffstat (limited to 'indra/llui/llview.cpp')
-rwxr-xr-xindra/llui/llview.cpp17
1 files changed, 5 insertions, 12 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 8d1c0a28c8..7494814898 100755
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -150,15 +150,13 @@ LLView::LLView(const LLView::Params& p)
LLView::~LLView()
{
- LL_DEBUGS("Baker") << "[3555] ~LLView -------------------------------------------------" << LL_ENDL;
-
- LL_DEBUGS("Baker") << "[3555] ~LLView() - Dirtying view rect" << LL_ENDL;
+ //LL_INFOS("Baker") << "[3555] ~LLView -- " << mName << ":" << (void*) this << " ----------------------" << LL_ENDL;
+
dirtyRect();
//llinfos << "Deleting view " << mName << ":" << (void*) this << llendl;
- LL_DEBUGS("Baker") << "[3555] ~LLView() - Deleting view " << mName << ":" << (void*) this << LL_ENDL;
if (LLView::sIsDrawing)
{
- LL_DEBUGS("Baker") << "[3555] ~LLView() - Deleting view " << mName << " during UI draw() phase" << LL_ENDL;
+ LL_INFOS("Baker") << "[3555] ~LLView() - Deleting view " << mName << " during UI draw() phase" << LL_ENDL;
lldebugs << "Deleting view " << mName << " during UI draw() phase" << llendl;
}
@@ -173,26 +171,21 @@ LLView::~LLView()
gFocusMgr.removeMouseCaptureWithoutCallback( this );
}
- LL_DEBUGS("Baker") << "[3555] ~LLView() - Deleting all children..." << LL_ENDL;
deleteAllChildren();
- LL_DEBUGS("Baker") << "[3555] ~LLView() - done." << LL_ENDL;
-
if (mParentView != NULL)
{
- LL_DEBUGS("Baker") << "[3555] ~LLView() - Removing this child view" << LL_ENDL;
+ // LL_INFOS("Baker") << "[3555] ~LLView() - Removing this child view" << LL_ENDL;
mParentView->removeChild(this);
}
if (mDefaultWidgets)
{
- LL_DEBUGS("Baker") << "[3555] ~LLView() - Deleting default widgets" << LL_ENDL;
-
delete mDefaultWidgets;
mDefaultWidgets = NULL;
}
- LL_DEBUGS("Baker") << "[3555] Exiting ~LLView()" << LL_ENDL;
+ //LL_INFOS("Baker") << "[3555] Exiting ~LLView() " << (void*) this << LL_ENDL;
}
// virtual