summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorPtolemy <ptolemy@lindenlab.com>2020-02-25 13:08:01 -0800
committerPtolemy <ptolemy@lindenlab.com>2020-02-25 13:25:15 -0800
commitb71e33b48cf321bb76081baeb210511cb9fbc1c8 (patch)
treef0b19c1aa1b3411b5e90837185cb30d0b7335258 /indra/newview
parentd180e94a8633bb7d6c355b36aba9712151d90207 (diff)
SL-12574 Cleanup unused argument
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvosky.cpp27
-rw-r--r--indra/newview/llvosky.h2
2 files changed, 14 insertions, 15 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index 64f34eb619..525251d42c 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -190,9 +190,8 @@ void LLSkyTex::initEmpty(const S32 tex)
createGLImage(tex);
}
-void LLSkyTex::create(const F32 brightness)
+void LLSkyTex::create()
{
- /// Brightness ignored for now.
U8* data = mImageRaw[sCurrent]->getData();
for (S32 i = 0; i < sResolution; ++i)
{
@@ -502,8 +501,8 @@ void LLVOSky::init()
initSkyTextureDirs(side, tile);
createSkyTexture(m_atmosphericsVars, side, tile);
}
- mSkyTex[side].create(1.0f);
- mShinyTex[side].create(1.0f);
+ mSkyTex[side].create();
+ mShinyTex[side].create();
}
initCubeMap();
@@ -764,35 +763,35 @@ bool LLVOSky::updateSky()
{
LLImageRaw* raw1 = nullptr;
LLImageRaw* raw2 = nullptr;
-
+
if (!is_alm_wl_sky)
- {
+ {
raw1 = mSkyTex[side].getImageRaw(TRUE);
raw2 = mSkyTex[side].getImageRaw(FALSE);
raw2->copy(raw1);
mSkyTex[side].createGLImage(tex);
- }
+ }
raw1 = mShinyTex[side].getImageRaw(TRUE);
raw2 = mShinyTex[side].getImageRaw(FALSE);
raw2->copy(raw1);
mShinyTex[side].createGLImage(tex);
-}
+ }
next_frame = 0;
// update the sky texture
if (!is_alm_wl_sky)
{
for (S32 i = 0; i < NUM_CUBEMAP_FACES; ++i)
-{
- mSkyTex[i].create(1.0f);
+ {
+ mSkyTex[i].create();
}
- }
+ }
for (S32 i = 0; i < NUM_CUBEMAP_FACES; ++i)
- {
- mShinyTex[i].create(1.0f);
- }
+ {
+ mShinyTex[i].create();
+ }
// update the environment map
initCubeMap();
diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h
index fc577ab5f8..39e42bbb24 100644
--- a/indra/newview/llvosky.h
+++ b/indra/newview/llvosky.h
@@ -78,7 +78,7 @@ protected:
void initEmpty(const S32 tex);
- void create(F32 brightness);
+ void create();
void setDir(const LLVector3 &dir, const S32 i, const S32 j)
{