diff options
| author | Don Kjer <don@lindenlab.com> | 2011-03-01 02:13:55 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-03-01 02:13:55 +0000 |
| commit | 627c28da811f00ddd02a5c2af0762f427ac02a1b (patch) | |
| tree | 13e1deab87b9a3c56595b796bd17347e47a93658 /indra/newview/llworld.cpp | |
| parent | f2764d24a3b3563d66a683c84af22b61648755cb (diff) | |
| parent | 0929315ab103433275a71f26a4900ee0615932e9 (diff) | |
Merge with viewer-headless
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 399442e5c4..d9ec41e73a 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -98,11 +98,6 @@ LLWorld::LLWorld() : mEdgeWaterObjects[i] = NULL; } - if (gNoRender) - { - return; - } - LLPointer<LLImageRaw> raw = new LLImageRaw(1,1,4); U8 *default_texture = raw->getData(); *(default_texture++) = MAX_WATER_COLOR.mV[0]; @@ -281,6 +276,8 @@ void LLWorld::removeRegion(const LLHost &host) delete regionp; updateWaterObjects(); + + llassert_always(!gObjectList.hasMapObjectInRegion(regionp)) ; } @@ -622,10 +619,7 @@ void LLWorld::updateVisibilities() if (LLViewerCamera::getInstance()->sphereInFrustum(regionp->getCenterAgent(), radius)) { regionp->calculateCameraDistance(); - if (!gNoRender) - { - regionp->getLand().updatePatchVisibilities(gAgent); - } + regionp->getLand().updatePatchVisibilities(gAgent); } else { |