diff options
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 1b24250618..40e297bac1 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -457,9 +457,9 @@ LLCoordCommon LL_COORD_TYPE_WINDOW::convertToCommon() const { const LLCoordWindow& self = LLCoordWindow::getTypedCoords(*this); - LLWindow* windowp = &(*LLWindow::beginInstances()); + auto windowit = LLWindow::instance_snapshot().begin(); LLCoordGL out; - windowp->convertCoords(self, &out); + windowit->convertCoords(self, &out); return out.convert(); } @@ -467,18 +467,18 @@ void LL_COORD_TYPE_WINDOW::convertFromCommon(const LLCoordCommon& from) { LLCoordWindow& self = LLCoordWindow::getTypedCoords(*this); - LLWindow* windowp = &(*LLWindow::beginInstances()); + auto windowit = LLWindow::instance_snapshot().begin(); LLCoordGL from_gl(from); - windowp->convertCoords(from_gl, &self); + windowit->convertCoords(from_gl, &self); } LLCoordCommon LL_COORD_TYPE_SCREEN::convertToCommon() const { const LLCoordScreen& self = LLCoordScreen::getTypedCoords(*this); - LLWindow* windowp = &(*LLWindow::beginInstances()); + auto windowit = LLWindow::instance_snapshot().begin(); LLCoordGL out; - windowp->convertCoords(self, &out); + windowit->convertCoords(self, &out); return out.convert(); } @@ -486,7 +486,7 @@ void LL_COORD_TYPE_SCREEN::convertFromCommon(const LLCoordCommon& from) { LLCoordScreen& self = LLCoordScreen::getTypedCoords(*this); - LLWindow* windowp = &(*LLWindow::beginInstances()); + auto windowit = LLWindow::instance_snapshot().begin(); LLCoordGL from_gl(from); - windowp->convertCoords(from_gl, &self); + windowit->convertCoords(from_gl, &self); } |