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

66
indra/newview/llselectmgr.cpp
View File

@@ -327,7 +327,7 @@ LLObjectSelectionHandle LLSelectMgr::selectObjectOnly(LLViewerObject* object, S3
return NULL;
}
// llinfos << "Adding object to selected object list" << llendl;
// LL_INFOS() << "Adding object to selected object list" << LL_ENDL;
// Place it in the list and tag it.
// This will refresh dialogs.
@@ -914,7 +914,7 @@ void LLSelectMgr::addAsIndividual(LLViewerObject *objectp, S32 face, BOOL undoab
}
else
{
llerrs << "LLSelectMgr::add face " << face << " out-of-range" << llendl;
LL_ERRS() << "LLSelectMgr::add face " << face << " out-of-range" << LL_ENDL;
return;
}
@@ -1364,7 +1364,7 @@ void LLSelectMgr::remove(LLViewerObject *objectp, S32 te, BOOL undoable)
}
else
{
llerrs << "LLSelectMgr::remove - tried to remove TE " << te << " that wasn't selected" << llendl;
LL_ERRS() << "LLSelectMgr::remove - tried to remove TE " << te << " that wasn't selected" << LL_ENDL;
return;
}
@@ -1387,7 +1387,7 @@ void LLSelectMgr::remove(LLViewerObject *objectp, S32 te, BOOL undoable)
else
{
// ...out of range face
llerrs << "LLSelectMgr::remove - TE " << te << " out of range" << llendl;
LL_ERRS() << "LLSelectMgr::remove - TE " << te << " out of range" << LL_ENDL;
}
updateSelectionCenter();
@@ -1486,26 +1486,26 @@ void LLSelectMgr::demoteSelectionToIndividuals()
//-----------------------------------------------------------------------------
void LLSelectMgr::dump()
{
llinfos << "Selection Manager: " << mSelectedObjects->getNumNodes() << " items" << llendl;
LL_INFOS() << "Selection Manager: " << mSelectedObjects->getNumNodes() << " items" << LL_ENDL;
llinfos << "TE mode " << mTEMode << llendl;
LL_INFOS() << "TE mode " << mTEMode << LL_ENDL;
S32 count = 0;
for (LLObjectSelection::iterator iter = getSelection()->begin();
iter != getSelection()->end(); iter++ )
{
LLViewerObject* objectp = (*iter)->getObject();
llinfos << "Object " << count << " type " << LLPrimitive::pCodeToString(objectp->getPCode()) << llendl;
llinfos << " hasLSL " << objectp->flagScripted() << llendl;
llinfos << " hasTouch " << objectp->flagHandleTouch() << llendl;
llinfos << " hasMoney " << objectp->flagTakesMoney() << llendl;
llinfos << " getposition " << objectp->getPosition() << llendl;
llinfos << " getpositionAgent " << objectp->getPositionAgent() << llendl;
llinfos << " getpositionRegion " << objectp->getPositionRegion() << llendl;
llinfos << " getpositionGlobal " << objectp->getPositionGlobal() << llendl;
LL_INFOS() << "Object " << count << " type " << LLPrimitive::pCodeToString(objectp->getPCode()) << LL_ENDL;
LL_INFOS() << " hasLSL " << objectp->flagScripted() << LL_ENDL;
LL_INFOS() << " hasTouch " << objectp->flagHandleTouch() << LL_ENDL;
LL_INFOS() << " hasMoney " << objectp->flagTakesMoney() << LL_ENDL;
LL_INFOS() << " getposition " << objectp->getPosition() << LL_ENDL;
LL_INFOS() << " getpositionAgent " << objectp->getPositionAgent() << LL_ENDL;
LL_INFOS() << " getpositionRegion " << objectp->getPositionRegion() << LL_ENDL;
LL_INFOS() << " getpositionGlobal " << objectp->getPositionGlobal() << LL_ENDL;
LLDrawable* drawablep = objectp->mDrawable;
llinfos << " " << (drawablep&& drawablep->isVisible() ? "visible" : "invisible") << llendl;
llinfos << " " << (drawablep&& drawablep->isState(LLDrawable::FORCE_INVISIBLE) ? "force_invisible" : "") << llendl;
LL_INFOS() << " " << (drawablep&& drawablep->isVisible() ? "visible" : "invisible") << LL_ENDL;
LL_INFOS() << " " << (drawablep&& drawablep->isState(LLDrawable::FORCE_INVISIBLE) ? "force_invisible" : "") << LL_ENDL;
count++;
}
@@ -1521,14 +1521,14 @@ void LLSelectMgr::dump()
{
if (node->isTESelected(te))
{
llinfos << "Object " << objectp << " te " << te << llendl;
LL_INFOS() << "Object " << objectp << " te " << te << LL_ENDL;
}
}
}
llinfos << mHighlightedObjects->getNumNodes() << " objects currently highlighted." << llendl;
LL_INFOS() << mHighlightedObjects->getNumNodes() << " objects currently highlighted." << LL_ENDL;
llinfos << "Center global " << mSelectionCenterGlobal << llendl;
LL_INFOS() << "Center global " << mSelectionCenterGlobal << LL_ENDL;
}
//-----------------------------------------------------------------------------
@@ -1571,8 +1571,8 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
&& !item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID())
&& (mSelectedObjects->getNumNodes() > 1) )
{
llwarns << "Attempted to apply no-copy texture to multiple objects"
<< llendl;
LL_WARNS() << "Attempted to apply no-copy texture to multiple objects"
<< LL_ENDL;
return;
}
// <edit>
@@ -3524,7 +3524,7 @@ bool LLSelectMgr::confirmDelete(const LLSD& notification, const LLSD& response,
S32 option = LLNotification::getSelectedOption(notification, response);
if (!handle->getObjectCount())
{
llwarns << "Nothing to delete!" << llendl;
LL_WARNS() << "Nothing to delete!" << LL_ENDL;
return false;
}
@@ -3987,7 +3987,7 @@ void LLSelectMgr::packMultipleUpdate(LLSelectNode* node, void *user_data)
}
if (type & UPD_SCALE)
{
//llinfos << "Sending object scale " << object->getScale() << llendl;
//LL_INFOS() << "Sending object scale " << object->getScale() << LL_ENDL;
htonmemcpy(&data[offset], &(object->getScale().mV), MVT_LLVector3, 12);
offset += 12;
}
@@ -4125,7 +4125,7 @@ void LLSelectMgr::packPermissionsHead(void* user_data)
/*
void LLSelectMgr::sendSelect()
{
llerrs << "Not implemented" << llendl;
LL_ERRS() << "Not implemented" << LL_ENDL;
}
*/
@@ -4274,9 +4274,9 @@ void LLSelectMgr::deselectAllIfTooFar()
{
if (mDebugSelectMgr)
{
llinfos << "Selection manager: auto-deselecting, select_dist = " << (F32) sqrt(select_dist_sq) << llendl;
llinfos << "agent pos global = " << gAgent.getPositionGlobal() << llendl;
llinfos << "selection pos global = " << selectionCenter << llendl;
LL_INFOS() << "Selection manager: auto-deselecting, select_dist = " << (F32) sqrt(select_dist_sq) << LL_ENDL;
LL_INFOS() << "agent pos global = " << gAgent.getPositionGlobal() << LL_ENDL;
LL_INFOS() << "selection pos global = " << selectionCenter << LL_ENDL;
}
deselectAll();
@@ -5004,7 +5004,7 @@ void LLSelectMgr::sendListToRegions(const std::string& message_name,
break;
default:
llerrs << "Bad send type " << send_type << " passed to SendListToRegions()" << llendl;
LL_ERRS() << "Bad send type " << send_type << " passed to SendListToRegions()" << LL_ENDL;
}
// bail if nothing selected
@@ -5078,7 +5078,7 @@ void LLSelectMgr::sendListToRegions(const std::string& message_name,
gMessageSystem->clearMessage();
}
// llinfos << "sendListToRegions " << message_name << " obj " << objects_sent << " pkt " << packets_sent << llendl;
// LL_INFOS() << "sendListToRegions " << message_name << " obj " << objects_sent << " pkt " << packets_sent << LL_ENDL;
}
@@ -5195,7 +5195,7 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
if (!node)
{
llwarns << "Couldn't find object " << id << " selected." << llendl;
LL_WARNS() << "Couldn't find object " << id << " selected." << LL_ENDL;
}
else
{
@@ -6466,7 +6466,7 @@ S32 get_family_count(LLViewerObject *parent)
{
if (!parent)
{
llwarns << "Trying to get_family_count on null parent!" << llendl;
LL_WARNS() << "Trying to get_family_count on null parent!" << LL_ENDL;
}
S32 count = 1; // for this object
LLViewerObject::const_child_list_t& child_list = parent->getChildren();
@@ -6477,11 +6477,11 @@ S32 get_family_count(LLViewerObject *parent)
if (!child)
{
llwarns << "Family object has NULL child! Show Doug." << llendl;
LL_WARNS() << "Family object has NULL child! Show Doug." << LL_ENDL;
}
else if (child->isDead())
{
llwarns << "Family object has dead child object. Show Doug." << llendl;
LL_WARNS() << "Family object has dead child object. Show Doug." << LL_ENDL;
}
else
{