diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
| commit | e188badaf29a1a02307f93864eed6737096bd9a1 (patch) | |
| tree | 767259ad3385fd9ede9722e04752bea008469f8c /indra/llui/llfloater.cpp | |
| parent | 4ad54702fce32905402cb6055c085ac14de188a2 (diff) | |
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index c4e928ce55..3d92280828 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -780,7 +780,7 @@ void LLFloater::snappedTo(const LLView* snap_view) void LLFloater::userSetShape(const LLRect& new_rect) { - const LLRect& old_rect = getRect(); + const LLRect old_rect = getRect(); LLView::userSetShape(new_rect); // if not minimized, adjust all snapped dependents to new shape |