summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-06 16:41:56 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-06 16:41:56 +0000
commit956ce3af6564c12d252aed8ae26581068064fb76 (patch)
tree10a0f0e82364f70f31bf9db9eea060ec63523645
parent66171216b01c1c5afafd3405a9d17e81f50c1925 (diff)
M_PI -> F_PI - who knew that M_PI was dropped from C99 onwards?!
Oh well, this should still be better.
-rw-r--r--indra/newview/llfloaterworldmap.cpp2
-rw-r--r--indra/newview/llworldmapview.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 823c8e7911..412011e76a 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -457,7 +457,7 @@ void LLFloaterWorldMap::draw()
{
F64 seconds = LLTimer::getElapsedSeconds();
double value = fmod(seconds, 2);
- value = 0.5 + 0.5*cos(value * M_PI);
+ value = 0.5 + 0.5*cos(value * F_PI);
LLColor4 loading_color(0.0, F32(value/2), F32(value), 1.0);
childSetColor("location_icon", loading_color);
}
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 0509898f40..9a249d14f8 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -822,7 +822,7 @@ void LLWorldMapView::draw()
else
{
double value = fmod(current_time, 2);
- value = 0.5 + 0.5*cos(value * M_PI);
+ value = 0.5 + 0.5*cos(value * F_PI);
LLColor4 loading_color(0.0, F32(value/2), F32(value), 1.0);
drawTracking( LLWorldMap::getInstance()->mUnknownLocation, loading_color, TRUE, getString("Loading"), "");
}