diff options
author | Callum Prentice <callum@lindenlab.com> | 2010-01-20 15:30:07 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2010-01-20 15:30:07 -0800 |
commit | 8aadfb1cb63a9527835c6c5127d041d924455505 (patch) | |
tree | 3fd5f231cae133ec25f0d0d4bf9eda53d0d4c0e4 /indra/newview/llviewerwindow.cpp | |
parent | 622f8b59ceb286f955351b6185a98919f03ed136 (diff) | |
parent | 20af2d325a4340aca997efbea752849e9f15d041 (diff) |
Merge with tip
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 769344d183..c1817496b1 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -101,7 +101,6 @@ #include "llfloaterbuildoptions.h" #include "llfloaterbuyland.h" #include "llfloatercamera.h" -#include "llfloaterchat.h" #include "llfloaterchatterbox.h" #include "llfloatercustomize.h" #include "llfloaterland.h" |