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

Fixes to gcc and debugs and such.

Browse Source
This commit is contained in:
Lirusaito
2016-02-15 16:35:31 -05:00
parent 731e907653
commit c3e593c20e
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llrender/llshadermgr.cpp
View File

@@ -875,7 +875,8 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
{ //dump every 128 lines
LL_WARNS("ShaderLoading") << "\n" << ostr.str() << LL_ENDL;
ostr = std::stringstream();
ostr.clear();
ostr.str(LLStringUtil::null);
}
}

6
indra/llui/lllayoutstack.cpp
View File

@@ -561,7 +561,7 @@ void LLLayoutStack::updateFractionalSizes()
panelp->mFractionalSize = panel_resizable_dim > 0.f
? llclamp(panel_resizable_dim / total_resizable_dim, MIN_FRACTIONAL_SIZE, MAX_FRACTIONAL_SIZE)
: MIN_FRACTIONAL_SIZE;
llassert(!llisnan(panelp->mFractionalSize));
llassert(!std::isnan(panelp->mFractionalSize));
}
}
@@ -789,7 +789,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
fraction_given_up -= new_fractional_size - panelp->mFractionalSize;
fraction_remaining -= panelp->mFractionalSize;
panelp->mFractionalSize = new_fractional_size;
llassert(!llisnan(panelp->mFractionalSize));
llassert(!std::isnan(panelp->mFractionalSize));
}
else
{
@@ -805,7 +805,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
fraction_given_up -= new_fractional_size - panelp->mFractionalSize;
fraction_remaining -= panelp->mFractionalSize;
panelp->mFractionalSize = new_fractional_size;
llassert(!llisnan(panelp->mFractionalSize));
llassert(!std::isnan(panelp->mFractionalSize));
}
else
{ // freeze new size as original size

6
indra/newview/llappviewerlinux_api_dbus.cpp
View File

@@ -47,9 +47,9 @@ extern "C" {
#include "apr_dso.h"
}
#define DEBUGMSG(...) LL_DEBUGS() << llformat(__VA_ARGS__) << llendl
#define INFOMSG(...) LL_INFOS() << llformat(__VA_ARGS__) << llendl
#define WARNMSG(...) LL_WARNS() << llformat(__VA_ARGS__) << llendl
#define DEBUGMSG(...) LL_DEBUGS() << llformat(__VA_ARGS__) << LL_ENDL
#define INFOMSG(...) LL_INFOS() << llformat(__VA_ARGS__) << LL_ENDL
#define WARNMSG(...) LL_WARNS() << llformat(__VA_ARGS__) << LL_ENDL
#define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) RTN (*ll##DBUSSYM)(__VA_ARGS__) = NULL
#include "llappviewerlinux_api_dbus_syms_raw.inc"

2
indra/newview/llvopartgroup.cpp
View File

@@ -409,7 +409,7 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
inv_camera_dist_squared = 1.f;
llassert(std::isfinite(inv_camera_dist_squared));
llassert(!llisnan(inv_camera_dist_squared));
llassert(!std::isnan(inv_camera_dist_squared));
F32 area = part->mScale.mV[0] * part->mScale.mV[1] * inv_camera_dist_squared;
tot_area = llmax(tot_area, area);

2
indra/newview/llwebprofile.cpp
View File

@@ -87,7 +87,7 @@ public:
Json::Reader reader;
if (!reader.parse(body, root))
{
LL_WARNS() << "Failed to parse upload config: " << reader.getFormatedErrorMessages() << LL_ENDL;
LL_WARNS() << "Failed to parse upload config: " << reader.getFormattedErrorMessages() << LL_ENDL;
LLWebProfile::reportImageUploadStatus(false);
return;
}