diff options
author | Steven Bennetts <steve@lindenlab.com> | 2007-12-07 20:27:13 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2007-12-07 20:27:13 +0000 |
commit | b01d567a5d9e2b5dd28bcc7b3f474fabd93e7a2f (patch) | |
tree | c45377783f53f033d43a4d06d36bbeb2a7f7e79b /indra/newview/llpanellogin.cpp | |
parent | a64f283477ea4db09c8b515ab94709e1fb5c82af (diff) |
EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge
EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge
ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
-rw-r--r-- | indra/newview/llpanellogin.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 7f846c2791..bc297354f7 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -38,7 +38,6 @@ #include "llfontgl.h" #include "llmd5.h" #include "llsecondlifeurls.h" -#include "llwindow.h" // shell_open() #include "llversionviewer.h" #include "v4color.h" |