diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-09 00:42:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-09 00:42:36 +0300 |
| commit | f56ef28ccf168b5f9d42a9d405924ca604326ff7 (patch) | |
| tree | 13b45d4c6f677c50721036c637b56f21e7cd2c64 /indra/newview/llslurl.cpp | |
| parent | 94a66b558401c77953c990a992a91c7b32493f82 (diff) | |
| parent | 9fdca96f8bd2211a99fe88e57b70cbecefa20b6d (diff) | |
Merge pull request #1944 from Ansariel/develop_c4244
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
Diffstat (limited to 'indra/newview/llslurl.cpp')
| -rw-r--r-- | indra/newview/llslurl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp index d80cf2e80e..9e567e3262 100644 --- a/indra/newview/llslurl.cpp +++ b/indra/newview/llslurl.cpp @@ -342,7 +342,7 @@ LLSLURL::LLSLURL(const std::string& grid, S32 y = ll_round((F32)fmod(position[VY], (F32)REGION_WIDTH_METERS)); S32 z = ll_round((F32)position[VZ]); mType = LOCATION; - mPosition = LLVector3(x, y, z); + mPosition = LLVector3((F32)x, (F32)y, (F32)z); } // create a simstring @@ -358,7 +358,7 @@ LLSLURL::LLSLURL(const std::string& grid, const LLVector3d& global_position) { *this = LLSLURL(LLGridManager::getInstance()->getGridId(grid), region, - LLVector3(global_position.mdV[VX], global_position.mdV[VY], global_position.mdV[VZ])); + LLVector3((F32)global_position.mdV[VX], (F32)global_position.mdV[VY], (F32)global_position.mdV[VZ])); } // create a slurl from a global position |