diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-23 01:16:12 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-23 01:16:12 +0100 |
| commit | 439273c9c11ec5f3c186fd7d97a28d11419153cd (patch) | |
| tree | f6e4f1566425921d71e40b9628011eb0f5f539f3 /indra/newview/llsky.cpp | |
| parent | 13536bb273b7413aa4461c8eeaf5a6a865f4234d (diff) | |
| parent | 689beff6698fcb8582c44f58bb9896606850b149 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llsky.cpp')
| -rw-r--r-- | indra/newview/llsky.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llsky.cpp b/indra/newview/llsky.cpp index 4ad579b33f..f7ccf7c7ff 100644 --- a/indra/newview/llsky.cpp +++ b/indra/newview/llsky.cpp @@ -136,7 +136,7 @@ void LLSky::setSunDirection(const LLVector3 &sun_direction, const LLVector3 &moo } } -LLVector3 LLSky::getSunDirection() const +/*LLVector3 LLSky::getSunDirection() const { if (mVOSkyp) { @@ -159,7 +159,7 @@ LLVector3 LLSky::getMoonDirection() const { return LLVector3::z_axis; } -} +}*/ LLColor4 LLSky::getSunDiffuseColor() const @@ -225,7 +225,7 @@ LLColor4 LLSky::getTotalAmbientColor() const } -BOOL LLSky::sunUp() const +/*BOOL LLSky::sunUp() const { if (mVOSkyp) { @@ -235,7 +235,7 @@ BOOL LLSky::sunUp() const { return TRUE; } -} +}*/ LLColor4U LLSky::getFadeColor() const |