diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
| commit | 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 (patch) | |
| tree | 9c5958572368be494b6302db8b03967a2c67b7ad /indra/newview/llviewerregion.cpp | |
| parent | a09f7d41efdb945755efaeb07f7418c1f6e2a78b (diff) | |
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index d060d2593c..42ea36baec 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -233,7 +233,7 @@ void LLViewerRegion::initStats() mPacketsLost = 0; mLastPacketsLost = 0; mPingDelay = 0; - mAlive = FALSE; // can become false if circuit disconnects + mAlive = false; // can become false if circuit disconnects } LLViewerRegion::~LLViewerRegion() @@ -808,11 +808,11 @@ void LLViewerRegion::updateNetStats() LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit(mHost); if (!cdp) { - mAlive = FALSE; + mAlive = false; return; } - mAlive = TRUE; + mAlive = true; mDeltaTime = dt; mLastPacketsIn = mPacketsIn; @@ -900,6 +900,11 @@ F32 LLViewerRegion::getLandHeightRegion(const LLVector3& region_pos) return mLandp->resolveHeightRegion( region_pos ); } +bool LLViewerRegion::isAlive() +{ + return mAlive; +} + BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos) { if (mParcelOverlay) |