diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-30 11:02:50 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-30 11:02:50 -0600 |
| commit | 736efc7b574635d5c86a97a33b456dd79a035777 (patch) | |
| tree | 495c201825007d51de0368ff326045428575f060 /indra/newview/pipeline.cpp | |
| parent | 12688c8b549d2baa33509dca60bbe14b039b17db (diff) | |
| parent | f713fe492f8b86a0743e0a553d62f06ff62500bb (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index af44acc64c..0ae9b08a4b 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7314,6 +7314,7 @@ void LLPipeline::doResetVertexBuffers() } } } + LLSpatialPartition::sTeleportRequested = FALSE; resetDrawOrders(); |