diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-12-18 12:27:05 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 15:28:17 -0400 |
| commit | de4a0b8f5b28799bf1c55976dcd8653d8a642a02 (patch) | |
| tree | dafec8ee4668117b36649571870a7ffd91a0d614 | |
| parent | 4c9e90de43670b0c641bc51bd686150d661c4203 (diff) | |
DRTVWR-494: Avoid keeping iterator to destroyed temporary container.
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 40e297bac1..d77997a928 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -457,9 +457,8 @@ LLCoordCommon LL_COORD_TYPE_WINDOW::convertToCommon() const { const LLCoordWindow& self = LLCoordWindow::getTypedCoords(*this); - auto windowit = LLWindow::instance_snapshot().begin(); LLCoordGL out; - windowit->convertCoords(self, &out); + LLWindow::instance_snapshot().begin()->convertCoords(self, &out); return out.convert(); } @@ -467,18 +466,16 @@ void LL_COORD_TYPE_WINDOW::convertFromCommon(const LLCoordCommon& from) { LLCoordWindow& self = LLCoordWindow::getTypedCoords(*this); - auto windowit = LLWindow::instance_snapshot().begin(); LLCoordGL from_gl(from); - windowit->convertCoords(from_gl, &self); + LLWindow::instance_snapshot().begin()->convertCoords(from_gl, &self); } LLCoordCommon LL_COORD_TYPE_SCREEN::convertToCommon() const { const LLCoordScreen& self = LLCoordScreen::getTypedCoords(*this); - auto windowit = LLWindow::instance_snapshot().begin(); LLCoordGL out; - windowit->convertCoords(self, &out); + LLWindow::instance_snapshot().begin()->convertCoords(self, &out); return out.convert(); } @@ -486,7 +483,6 @@ void LL_COORD_TYPE_SCREEN::convertFromCommon(const LLCoordCommon& from) { LLCoordScreen& self = LLCoordScreen::getTypedCoords(*this); - auto windowit = LLWindow::instance_snapshot().begin(); LLCoordGL from_gl(from); - windowit->convertCoords(from_gl, &self); + LLWindow::instance_snapshot().begin()->convertCoords(from_gl, &self); } |