diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-03-31 01:41:19 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-03-31 01:41:19 +0000 |
| commit | ea8fb7238e6f12383ee4bc081475fa6235637581 (patch) | |
| tree | f384da93c884353bef55cf887f6c86f2081db271 /indra/newview/llvosky.cpp | |
| parent | ffc6680d956069625fc1fe5da133bdf7922cea83 (diff) | |
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llvosky.cpp')
| -rw-r--r-- | indra/newview/llvosky.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 987d2ac7cb..94f9f0b21f 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -617,7 +617,6 @@ void LLVOSky::restoreGL() calcBrightnessScaleAndColors(); - // Water is currently broken on Mac. if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap) { LLCubeMap* cube_map = getCubeMap(); @@ -1232,18 +1231,14 @@ BOOL LLVOSky::updateSky() mSkyTex[side].createGLImage(mSkyTex[side].getWhich(FALSE)); } next_frame = 0; - //llSkyTex::stepCurrent(); } - if (!gSavedSettings.getBOOL("RenderDynamicReflections")) + std::vector<LLPointer<LLImageRaw> > images; + for (S32 side = 0; side < 6; side++) { - std::vector<LLPointer<LLImageRaw> > images; - for (S32 side = 0; side < 6; side++) - { - images.push_back(mSkyTex[side].getImageRaw(FALSE)); - } - mCubeMap->init(images); + images.push_back(mSkyTex[side].getImageRaw(FALSE)); } + mCubeMap->init(images); } } |