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

Sync llcommon with Alchemy a bit.

Browse Source 
llmath::llround->ll_round
LL_ICC->LL_INTELC
Add llpredicate
Add LL_CPP11 macro
Remove llhash
Update llinitparam, llsd and all relatives of it.
This commit is contained in:
Inusaito Sayori
2015-03-20 22:04:04 -04:00
parent 16a2b28c1b
commit 72080e79e9
135 changed files with 1940 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llslurl.cpp
View File

@@ -356,9 +356,9 @@ LLSLURL::LLSLURL(const std::string& grid,
{
mGrid = grid;
mRegion = region;
S32 x = llmath::llround( (F32)position[VX] );
S32 y = llmath::llround( (F32)position[VY] );
S32 z = llmath::llround( (F32)position[VZ] );
S32 x = ll_round( (F32)position[VX] );
S32 y = ll_round( (F32)position[VY] );
S32 z = ll_round( (F32)position[VZ] );
mType = LOCATION;
mPosition = LLVector3(x, y, z);
}
@@ -417,9 +417,9 @@ std::string LLSLURL::getSLURLString() const
case LOCATION:
{
// lookup the grid
S32 x = llmath::llround( (F32)mPosition[VX] );
S32 y = llmath::llround( (F32)mPosition[VY] );
S32 z = llmath::llround( (F32)mPosition[VZ] );
S32 x = ll_round( (F32)mPosition[VX] );
S32 y = ll_round( (F32)mPosition[VY] );
S32 z = ll_round( (F32)mPosition[VZ] );
//return LLGridManager::getInstance()->getSLURLBase(mGrid) +
//Singu TODO: Implement LLHippoGridMgr::getSLURLBase some day. For now it's hardcoded.
std::string fixed_slurl;
@@ -471,9 +471,9 @@ std::string LLSLURL::getLoginString() const
case LOCATION:
unescaped_start << "uri:"
<< mRegion << "&"
<< llmath::llround(mPosition[0]) << "&"
<< llmath::llround(mPosition[1]) << "&"
<< llmath::llround(mPosition[2]);
<< ll_round(mPosition[0]) << "&"
<< ll_round(mPosition[1]) << "&"
<< ll_round(mPosition[2]);
break;
case HOME_LOCATION:
unescaped_start << "home";
@@ -517,9 +517,9 @@ std::string LLSLURL::getLocationString() const
{
return llformat("%s/%d/%d/%d",
mRegion.c_str(),
(int)llmath::llround(mPosition[0]),
(int)llmath::llround(mPosition[1]),
(int)llmath::llround(mPosition[2]));
(int)ll_round(mPosition[0]),
(int)ll_round(mPosition[1]),
(int)ll_round(mPosition[2]));
}
// static