diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
| commit | a65188d85f75e848d224bd335a00ed8aa51f945e (patch) | |
| tree | f43b390cba45d047fc0fa31659f6969f62b925d1 /indra/newview/llviewerwindow.cpp | |
| parent | 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (diff) | |
| parent | 5ca943cd0279d35ffdf584fa0de3b795645f276c (diff) | |
Merge from viewer2. Minor conflict resolved.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 33bfee798a..eedec5b0a9 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" @@ -1638,7 +1637,7 @@ void LLViewerWindow::shutdownGL() LLViewerTextureManager::cleanup() ; LLImageGL::cleanupClass() ; - llinfos << "All texturs and llimagegl images are destroyed!" << llendl ; + llinfos << "All textures and llimagegl images are destroyed!" << llendl ; llinfos << "Cleaning up select manager" << llendl; LLSelectMgr::getInstance()->cleanup(); |