diff options
| author | James Cook <james@lindenlab.com> | 2010-01-04 12:57:31 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-01-04 12:57:31 -0800 |
| commit | 1355d16d2f24f9d623df70059b1f0001cf673209 (patch) | |
| tree | ce50b243817d8acb42306bca85813e2a61e8b278 /indra/newview/llviewerwindow.cpp | |
| parent | ba9a4f80b5bd97ca3b6bd1fa01ddf1c23698a569 (diff) | |
| parent | 6157187e5bdff889613673f11852d9c25f96bf92 (diff) | |
Merge, bringing in a few viewer-2-0 bug fixes
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -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 5c86822787..1400253176 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -182,7 +182,6 @@ #include "llworldmapview.h" #include "pipeline.h" #include "llappviewer.h" -#include "llurlsimstring.h" #include "llviewerdisplay.h" #include "llspatialpartition.h" #include "llviewerjoystick.h" |