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

46
indra/llui/llmenugl.cpp
View File

@@ -158,7 +158,7 @@ LLMenuItemGL::LLMenuItemGL( const std::string& name, const std::string& label, K
LLMenuItemGL::~LLMenuItemGL()
{
lldebugs << "Menu destroyed:" << this->getName() << llendl;
LL_DEBUGS() << "Menu destroyed:" << this->getName() << LL_ENDL;
};
// virtual
@@ -1160,7 +1160,7 @@ void LLMenuItemToggleGL::buildDrawLabel( void )
void LLMenuItemToggleGL::onCommit( void )
{
getMenu()->setItemLastSelected( this );
//llinfos << "LLMenuItemToggleGL::onCommit " << mLabel.c_str() << llendl;
//LL_INFOS() << "LLMenuItemToggleGL::onCommit " << mLabel.c_str() << LL_ENDL;
*mToggle = !(*mToggle);
buildDrawLabel();
LLMenuItemGL::onCommit();
@@ -1174,7 +1174,7 @@ LLMenuItemBranchGL::LLMenuItemBranchGL( const std::string& name, const std::stri
LLMenuGL* branch = dynamic_cast<LLMenuGL*>(branch_handle.get());
if(!branch)
{
llerrs << "Non-menu handle passed as branch reference." << llendl;
LL_ERRS() << "Non-menu handle passed as branch reference." << LL_ENDL;
}
if (branch)
@@ -1393,7 +1393,7 @@ void LLMenuItemBranchGL::handleVisibilityChange( BOOL new_visibility )
{
if (new_visibility == FALSE && getBranch() && !getBranch()->getTornOff())
{
lldebugs << "Forcing branch to visible. Menu: " << getName() << " Branch: " << getBranch()->getName() << llendl;
LL_DEBUGS() << "Forcing branch to visible. Menu: " << getName() << " Branch: " << getBranch()->getName() << LL_ENDL;
getBranch()->setVisible(FALSE);
}
LLMenuItemGL::handleVisibilityChange(new_visibility);
@@ -2214,7 +2214,7 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
if (!callback)
{
lldebugs << "Ignoring \"on_check\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << llendl;
LL_DEBUGS() << "Ignoring \"on_check\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << LL_ENDL;
continue;
}
@@ -2259,7 +2259,7 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
if (!callback)
{
lldebugs << "Ignoring \"on_click\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << llendl;
LL_DEBUGS() << "Ignoring \"on_click\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << LL_ENDL;
continue;
}
@@ -2293,7 +2293,7 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
if (!callback)
{
lldebugs << "Ignoring \"on_enable\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << llendl;
LL_DEBUGS() << "Ignoring \"on_enable\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << LL_ENDL;
continue;
}
@@ -2337,7 +2337,7 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
if (!callback)
{
lldebugs << "Ignoring \"on_visible\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << llendl;
LL_DEBUGS() << "Ignoring \"on_visible\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << LL_ENDL;
continue;
}
@@ -2366,17 +2366,17 @@ bool LLMenuGL::addChild(LLView* view, S32 tab_group)
{
if (LLMenuGL* menup = dynamic_cast<LLMenuGL*>(view))
{
lldebugs << "Adding menu " << menup->getName() << " to " << getName() << llendl;
LL_DEBUGS() << "Adding menu " << menup->getName() << " to " << getName() << LL_ENDL;
appendMenu(menup);
return true;
}
else if (LLMenuItemGL* itemp = dynamic_cast<LLMenuItemGL*>(view))
{
lldebugs << "Adding " << itemp->getName() << " to " << getName() << llendl;
LL_DEBUGS() << "Adding " << itemp->getName() << " to " << getName() << LL_ENDL;
append(itemp);
return true;
}
lldebugs << "Error adding unknown child '"<<(view ? view->getName() : std::string("NULL")) << "' to " << getName() << llendl;
LL_DEBUGS() << "Error adding unknown child '"<<(view ? view->getName() : std::string("NULL")) << "' to " << getName() << LL_ENDL;
return false;
}
@@ -2619,7 +2619,7 @@ bool LLMenuGL::scrollItems(EScrollingDirection direction)
}
default:
//LL_WARNS() << "Unknown scrolling direction: " << direction << LL_ENDL;
llwarns << "Unknown scrolling direction: " << direction << llendl;
LL_WARNS() << "Unknown scrolling direction: " << direction << LL_ENDL;
}
mNeedsArrange = TRUE;
@@ -3214,8 +3214,8 @@ BOOL LLMenuGL::appendMenu( LLMenuGL* menu )
{
if( menu == this )
{
llerrs << "** Attempt to attach menu to itself. This is certainly "
<< "a logic error." << llendl;
LL_ERRS() << "** Attempt to attach menu to itself. This is certainly "
<< "a logic error." << LL_ENDL;
}
BOOL success = TRUE;
@@ -3707,7 +3707,7 @@ void LLMenuGL::setVisible(BOOL visible)
{
if (!visible)
{
lldebugs << "Hiding " << getName() << llendl;
LL_DEBUGS() << "Hiding " << getName() << LL_ENDL;
mFadeTimer.start();
clearHoverItem();
// reset last known mouse coordinates so
@@ -3717,7 +3717,7 @@ void LLMenuGL::setVisible(BOOL visible)
}
else
{
lldebugs << "Showing " << getName() << llendl;
LL_DEBUGS() << "Showing " << getName() << LL_ENDL;
mHasSelection = true;
mFadeTimer.stop();
}
@@ -3743,7 +3743,7 @@ LLMenuGL* LLMenuGL::getChildMenuByName(const std::string& name, BOOL recurse) co
return menup;
}
}
llwarns << "Child Menu " << name << " not found in menu " << getName() << llendl;
LL_WARNS() << "Child Menu " << name << " not found in menu " << getName() << LL_ENDL;
return NULL;
}
@@ -4052,11 +4052,11 @@ void LLMenuBarGL::setVisible(BOOL visible)
{
if(!visible)
{
lldebugs << "Hiding " << getName() << llendl;
LL_DEBUGS() << "Hiding " << getName() << LL_ENDL;
}
else
{
lldebugs << "Showing " << getName() << llendl;
LL_DEBUGS() << "Showing " << getName() << LL_ENDL;
}
}
LLUICtrl::setVisible(visible);
@@ -4168,8 +4168,8 @@ BOOL LLMenuBarGL::appendMenu( LLMenuGL* menu )
{
if( menu == this )
{
llerrs << "** Attempt to attach menu to itself. This is certainly "
<< "a logic error." << llendl;
LL_ERRS() << "** Attempt to attach menu to itself. This is certainly "
<< "a logic error." << LL_ENDL;
}
BOOL success = TRUE;
@@ -4886,7 +4886,6 @@ BOOL LLContextMenu::handleHoverOver(LLMenuItemGL* item, S32 x, S32 y)
if (item && item->getEnabled())
{
getWindow()->setCursor(UI_CURSOR_ARROW);
lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;
handled = TRUE;
if (item != mHoverItem)
@@ -4913,7 +4912,6 @@ BOOL LLContextMenu::handleHoverOver(LLMenuItemGL* item, S32 x, S32 y)
if( !handled && pointInView( x, y ) )
{
getWindow()->setCursor(UI_CURSOR_ARROW);
lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;
handled = TRUE;
}
@@ -4989,7 +4987,7 @@ BOOL LLContextMenu::appendContextSubMenu(LLContextMenu* menu)
{
if (menu == this)
{
llerrs << "Can't attach a context menu to itself" << llendl;
LL_ERRS() << "Can't attach a context menu to itself" << LL_ENDL;
}
LLContextMenuBranch* item = new LLContextMenuBranch(menu->getName(), menu->getLabel(), menu);
getParent()->addChild(item->getBranch());