diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-28 20:41:34 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-28 20:41:34 +0200 |
| commit | b2f1e8899b32f681e13705d684db9a93d18450ae (patch) | |
| tree | 70ee7701d7a24a0759915f8050786ed43a8a2a7a /indra/newview/llsprite.cpp | |
| parent | 0ef7a9b39cf72da1211039ab22bdf8f9f6a2c984 (diff) | |
| parent | 65764a5b7bab573b261386aca11a7967a21ec2d2 (diff) | |
Merge branch 'develop' into marchcat/c-develop
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
Diffstat (limited to 'indra/newview/llsprite.cpp')
| -rw-r--r-- | indra/newview/llsprite.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsprite.cpp b/indra/newview/llsprite.cpp index e51aeb6080..09c57eaf1d 100644 --- a/indra/newview/llsprite.cpp +++ b/indra/newview/llsprite.cpp @@ -37,7 +37,7 @@ #include "llsprite.h" -#include "math.h" +#include <cmath> #include "lldrawable.h" #include "llface.h" |