summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowwin32.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-11-29 10:40:45 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-11-29 10:40:45 -0800
commite919349054c8ae80a054f047756e6596b58a3e13 (patch)
tree4d2abc589c448fe2b54f7be09385e644fd5b87af /indra/llwindow/llwindowwin32.cpp
parentec6893db5099b1e95802254277de0cc2e9bea83c (diff)
parentadeb71d98279fc4e8af7859cd36114be9f95e6da (diff)
Merge with viewer-experience
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
-rw-r--r--indra/llwindow/llwindowwin32.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 06360d261f..34b1184cee 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -861,7 +861,7 @@ BOOL LLWindowWin32::setPosition(const LLCoordScreen position)
return TRUE;
}
-BOOL LLWindowWin32::setSize(const LLCoordScreen size)
+BOOL LLWindowWin32::setSizeImpl(const LLCoordScreen size)
{
LLCoordScreen position;