diff options
| author | Richard Linden <none@none> | 2012-02-23 12:40:27 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-23 12:40:27 -0800 |
| commit | f4a122b6d72bdc2dc482fb04475703ffa5a00219 (patch) | |
| tree | 0155d0d080b42740666564ed9f02b9d33069a4e5 /indra/newview/llviewerwindow.cpp | |
| parent | a5e4b15b7d29a64781eb32ef71e557a5bb8dc870 (diff) | |
| parent | 48bc2a7c9f6175a5c3179f6fccc98c3d3c50a4c9 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index ab20ff1d42..b1b6abe723 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4102,7 +4102,7 @@ void LLViewerWindow::movieSize(S32 new_width, S32 new_height) gViewerWindow->getWindow()->getSize(&size); if ( size != new_size ) { - gViewerWindow->getWindow()->setSize(new_size.convert()); + gViewerWindow->getWindow()->setSize(new_size); } } |