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

26
indra/newview/llpanelobject.cpp
View File

@@ -890,7 +890,7 @@ void LLPanelObject::getState( )
// </edit>
else
{
llinfos << "Unknown path " << (S32) path << " profile " << (S32) profile << " in getState" << llendl;
LL_INFOS() << "Unknown path " << (S32) path << " profile " << (S32) profile << " in getState" << LL_ENDL;
selected_item = MI_BOX;
}
@@ -1482,11 +1482,11 @@ void LLPanelObject::sendIsPhysical()
LLSelectMgr::getInstance()->selectionUpdatePhysics(value);
mIsPhysical = value;
llinfos << "update physics sent" << llendl;
LL_INFOS() << "update physics sent" << LL_ENDL;
}
else
{
llinfos << "update physics not changed" << llendl;
LL_INFOS() << "update physics not changed" << LL_ENDL;
}
}
@@ -1498,11 +1498,11 @@ void LLPanelObject::sendIsTemporary()
LLSelectMgr::getInstance()->selectionUpdateTemporary(value);
mIsTemporary = value;
llinfos << "update temporary sent" << llendl;
LL_INFOS() << "update temporary sent" << LL_ENDL;
}
else
{
llinfos << "update temporary not changed" << llendl;
LL_INFOS() << "update temporary not changed" << LL_ENDL;
}
}
@@ -1515,11 +1515,11 @@ void LLPanelObject::sendIsPhantom()
LLSelectMgr::getInstance()->selectionUpdatePhantom(value);
mIsPhantom = value;
llinfos << "update phantom sent" << llendl;
LL_INFOS() << "update phantom sent" << LL_ENDL;
}
else
{
llinfos << "update phantom not changed" << llendl;
LL_INFOS() << "update phantom not changed" << LL_ENDL;
}
}
@@ -1688,8 +1688,8 @@ void LLPanelObject::getVolumeParams(LLVolumeParams& volume_params)
// </edit>
default:
llwarns << "Unknown base type " << selected_type
<< " in getVolumeParams()" << llendl;
LL_WARNS() << "Unknown base type " << selected_type
<< " in getVolumeParams()" << LL_ENDL;
// assume a box
selected_type = MI_BOX;
profile = LL_PCODE_PROFILE_SQUARE;
@@ -2039,11 +2039,11 @@ void LLPanelObject::sendScale(BOOL btn_down)
}
LLSelectMgr::getInstance()->adjustTexturesByScale(TRUE, !dont_stretch_textures);
// llinfos << "scale sent" << llendl;
// LL_INFOS() << "scale sent" << LL_ENDL;
}
else
{
// llinfos << "scale not changed" << llendl;
// LL_INFOS() << "scale not changed" << LL_ENDL;
}
}
@@ -2554,13 +2554,13 @@ void LLPanelObject::onPasteParams(void* user_data)
void LLPanelObject::onLinkObj(void* user_data)
{
llinfos << "Attempting link." << llendl;
LL_INFOS() << "Attempting link." << LL_ENDL;
LLSelectMgr::getInstance()->linkObjects();
}
void LLPanelObject::onUnlinkObj(void* user_data)
{
llinfos << "Attempting unlink." << llendl;
LL_INFOS() << "Attempting unlink." << LL_ENDL;
LLSelectMgr::getInstance()->unlinkObjects();
}