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

54
indra/llprimitive/llvolumemessage.cpp
View File

@@ -115,8 +115,8 @@ bool LLVolumeMessage::unpackProfileParams(
temp_f32 = temp_u16 * CUT_QUANTA;
if (temp_f32 > 1.f)
{
llwarns << "Profile begin out of range: " << temp_f32
<< ". Clamping to 0.0." << llendl;
LL_WARNS() << "Profile begin out of range: " << temp_f32
<< ". Clamping to 0.0." << LL_ENDL;
temp_f32 = 0.f;
ok = false;
}
@@ -126,8 +126,8 @@ bool LLVolumeMessage::unpackProfileParams(
temp_f32 = temp_u16 * CUT_QUANTA;
if (temp_f32 > 1.f)
{
llwarns << "Profile end out of range: " << 1.f - temp_f32
<< ". Clamping to 1.0." << llendl;
LL_WARNS() << "Profile end out of range: " << 1.f - temp_f32
<< ". Clamping to 1.0." << LL_ENDL;
temp_f32 = 1.f;
ok = false;
}
@@ -137,19 +137,19 @@ bool LLVolumeMessage::unpackProfileParams(
temp_f32 = temp_u16 * HOLLOW_QUANTA;
if (temp_f32 > 1.f)
{
llwarns << "Profile hollow out of range: " << temp_f32
<< ". Clamping to 0.0." << llendl;
LL_WARNS() << "Profile hollow out of range: " << temp_f32
<< ". Clamping to 0.0." << LL_ENDL;
temp_f32 = 0.f;
ok = false;
}
params->setHollow(temp_f32);
/*
llinfos << "Unpacking Profile Block " << block_num << llendl;
llinfos << "Curve: " << (U32)getCurve() << llendl;
llinfos << "Begin: " << getBegin() << llendl;
llinfos << "End: " << getEnd() << llendl;
llinfos << "Hollow: " << getHollow() << llendl;
LL_INFOS() << "Unpacking Profile Block " << block_num << LL_ENDL;
LL_INFOS() << "Curve: " << (U32)getCurve() << LL_ENDL;
LL_INFOS() << "Begin: " << getBegin() << LL_ENDL;
LL_INFOS() << "End: " << getEnd() << LL_ENDL;
LL_INFOS() << "Hollow: " << getHollow() << LL_ENDL;
*/
return ok;
@@ -171,8 +171,8 @@ bool LLVolumeMessage::unpackProfileParams(
temp_f32 = temp_u16 * CUT_QUANTA;
if (temp_f32 > 1.f)
{
llwarns << "Profile begin out of range: " << temp_f32 << llendl;
llwarns << "Clamping to 0.0" << llendl;
LL_WARNS() << "Profile begin out of range: " << temp_f32 << LL_ENDL;
LL_WARNS() << "Clamping to 0.0" << LL_ENDL;
temp_f32 = 0.f;
ok = false;
}
@@ -182,8 +182,8 @@ bool LLVolumeMessage::unpackProfileParams(
temp_f32 = temp_u16 * CUT_QUANTA;
if (temp_f32 > 1.f)
{
llwarns << "Profile end out of range: " << 1.f - temp_f32 << llendl;
llwarns << "Clamping to 1.0" << llendl;
LL_WARNS() << "Profile end out of range: " << 1.f - temp_f32 << LL_ENDL;
LL_WARNS() << "Clamping to 1.0" << LL_ENDL;
temp_f32 = 1.f;
ok = false;
}
@@ -193,8 +193,8 @@ bool LLVolumeMessage::unpackProfileParams(
temp_f32 = temp_u16 * HOLLOW_QUANTA;
if (temp_f32 > 1.f)
{
llwarns << "Profile hollow out of range: " << temp_f32 << llendl;
llwarns << "Clamping to 0.0" << llendl;
LL_WARNS() << "Profile hollow out of range: " << temp_f32 << LL_ENDL;
LL_WARNS() << "Clamping to 0.0" << LL_ENDL;
temp_f32 = 0.f;
ok = false;
}
@@ -385,12 +385,12 @@ bool LLVolumeMessage::unpackPathParams(
params->setSkew((F32)(skew * SCALE_QUANTA));
/*
llinfos << "Unpacking Path Block " << block_num << llendl;
llinfos << "Curve: " << (U32)params->getCurve() << llendl;
llinfos << "Begin: " << params->getBegin() << llendl;
llinfos << "End: " << params->getEnd() << llendl;
llinfos << "Scale: " << params->getScale() << llendl;
llinfos << "Twist: " << params->getTwist() << llendl;
LL_INFOS() << "Unpacking Path Block " << block_num << LL_ENDL;
LL_INFOS() << "Curve: " << (U32)params->getCurve() << LL_ENDL;
LL_INFOS() << "Begin: " << params->getBegin() << LL_ENDL;
LL_INFOS() << "End: " << params->getEnd() << LL_ENDL;
LL_INFOS() << "Scale: " << params->getScale() << LL_ENDL;
LL_INFOS() << "Twist: " << params->getTwist() << LL_ENDL;
*/
return true;
@@ -486,16 +486,16 @@ bool LLVolumeMessage::constrainVolumeParams(LLVolumeParams& params)
bad |= params.setSkew(params.getPathParams().getSkew()) ? 0 : 0x800;
if(bad)
{
llwarns << "LLVolumeMessage::constrainVolumeParams() - "
LL_WARNS() << "LLVolumeMessage::constrainVolumeParams() - "
<< "forced to constrain incoming volume params: "
<< llformat("0x%04x",bad) << llendl;
<< llformat("0x%04x",bad) << LL_ENDL;
}
return bad ? false : true;
}
bool LLVolumeMessage::packVolumeParams(const LLVolumeParams* params, LLMessageSystem *mesgsys)
{
// llinfos << "pack volume" << llendl;
// LL_INFOS() << "pack volume" << LL_ENDL;
if (params)
{
packPathParams(&params->getPathParams(), mesgsys);
@@ -511,7 +511,7 @@ bool LLVolumeMessage::packVolumeParams(const LLVolumeParams* params, LLMessageSy
bool LLVolumeMessage::packVolumeParams(const LLVolumeParams* params, LLDataPacker &dp)
{
// llinfos << "pack volume" << llendl;
// LL_INFOS() << "pack volume" << LL_ENDL;
if (params)
{
packPathParams(&params->getPathParams(), dp);