diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 01:34:52 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 01:34:52 -0800 |
| commit | c6163fafaac9c72683b11894ed309d1f55a745c8 (patch) | |
| tree | 612be60185cbea598bdf907f045c9fc29fb40a2c /indra/newview/llviewerwindow.cpp | |
| parent | 0bf246ed663ad11d316fe7898a3fee3f57676d4b (diff) | |
| parent | 82de841c52357642d30b6d89b11da079f9c0f5d1 (diff) | |
automated merge
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 333527e878..b2ee7f4469 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(); |