diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-11-08 13:34:24 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-11-08 13:34:24 -0500 |
| commit | bad6aa7f6b0527e2fc75f9321f640baaa32157c0 (patch) | |
| tree | dd63da645217c69c7c3db9304d7b428a745a31f6 | |
| parent | 543edbcdc0b2d3dd921273533b3b1c2ff852a91b (diff) | |
Fix for manual merge errors.
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 12701b4fce..573fb1a8b5 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -668,7 +668,6 @@ public: ypos += y_inc; } - } } void draw() |