Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
indra/llui/llview.cpp
View File

@@ -176,12 +176,12 @@ LLView::LLView( const std::string& name, const LLRect& rect, BOOL mouse_opaque,
LLView::~LLView()
{
//llinfos << "Deleting view " << mName << ":" << (void*) this << llendl;
//LL_INFOS() << "Deleting view " << mName << ":" << (void*) this << LL_ENDL;
// llassert(LLView::sIsDrawing == FALSE);
if( hasMouseCapture() )
{
//llwarns << "View holding mouse capture deleted: " << getName() << ". Mouse capture removed." << llendl;
//LL_WARNS() << "View holding mouse capture deleted: " << getName() << ". Mouse capture removed." << LL_ENDL;
gFocusMgr.removeMouseCaptureWithoutCallback( this );
}
@@ -322,7 +322,7 @@ bool LLView::addChild(LLView* child, S32 tab_group)
}
if (mParentView == child)
{
llerrs << "Adding view " << child->getName() << " as child of itself" << llendl;
LL_ERRS() << "Adding view " << child->getName() << " as child of itself" << LL_ENDL;
}
// remove from current parent
@@ -392,7 +392,7 @@ void LLView::removeChild(LLView* child)
}
else
{
llwarns << child->getName() << "is not a child of " << getName() << llendl;
LL_WARNS() << child->getName() << "is not a child of " << getName() << LL_ENDL;
}
updateBoundingRect();
}
@@ -680,12 +680,12 @@ BOOL LLView::handleHover(S32 x, S32 y, MASK mask)
void LLView::onMouseEnter(S32 x, S32 y, MASK mask)
{
//llinfos << "Mouse entered " << getName() << llendl;
//LL_INFOS() << "Mouse entered " << getName() << LL_ENDL;
}
void LLView::onMouseLeave(S32 x, S32 y, MASK mask)
{
//llinfos << "Mouse left " << getName() << llendl;
//LL_INFOS() << "Mouse left " << getName() << LL_ENDL;
}
std::string LLView::getShowNamesToolTip()
@@ -810,7 +810,7 @@ LLView* LLView::childrenHandleCharEvent(const std::string& desc, const METHOD& m
{
if (LLView::sDebugKeys)
{
llinfos << desc << " handled by " << viewp->getName() << llendl;
LL_INFOS() << desc << " handled by " << viewp->getName() << LL_ENDL;
}
return viewp;
}
@@ -950,7 +950,7 @@ BOOL LLView::handleKey(KEY key, MASK mask, BOOL called_from_parent)
handled = handleKeyHere( key, mask );
if (handled && LLView::sDebugKeys)
{
llinfos << "Key handled by " << getName() << llendl;
LL_INFOS() << "Key handled by " << getName() << LL_ENDL;
}
}
}
@@ -987,7 +987,7 @@ BOOL LLView::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
handled = handleUnicodeCharHere(uni_char);
if (handled && LLView::sDebugKeys)
{
llinfos << "Unicode key handled by " << getName() << llendl;
LL_INFOS() << "Unicode key handled by " << getName() << LL_ENDL;
}
}
}
@@ -1210,7 +1210,7 @@ void LLView::drawChildren()
// Check for bogus rectangle
if (!getRect().isValid())
{
llwarns << "Bogus rectangle for " << getName() << " with " << mRect << llendl;
LL_WARNS() << "Bogus rectangle for " << getName() << " with " << mRect << LL_ENDL;
}
}
}
@@ -2223,7 +2223,7 @@ LLView* LLView::findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESna
}
break;
default:
llerrs << "Invalid snap edge" << llendl;
LL_ERRS() << "Invalid snap edge" << LL_ENDL;
}
}
@@ -2325,7 +2325,7 @@ LLView* LLView::findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESna
}
break;
default:
llerrs << "Invalid snap edge" << llendl;
LL_ERRS() << "Invalid snap edge" << LL_ENDL;
}
}
}
@@ -2341,7 +2341,7 @@ LLView* LLView::findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESna
void LLView::registerEventListener(std::string name, LLSimpleListener* function)
{
mDispatchList.insert(std::pair<std::string, LLSimpleListener*>(name, function));
lldebugs << getName() << " registered " << name << llendl;
LL_DEBUGS() << getName() << " registered " << name << LL_ENDL;
}
@@ -2934,7 +2934,7 @@ void LLView::setControlName(const std::string& control_name, LLView *context)
if (!mControlName.empty())
{
llwarns << "setControlName called twice on same control!" << llendl;
LL_WARNS() << "setControlName called twice on same control!" << LL_ENDL;
mControlConnection.disconnect(); // disconnect current signal
mControlName.clear();
}