diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-11 22:12:34 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-11 22:12:34 -0400 |
| commit | 08f3ea28f5681bbbd755947ec09970c11410bd0a (patch) | |
| tree | f09648be5ac4e482fe4e9cffd5fdc81f5fe78e24 | |
| parent | 03a23fd2449c72391055311f7d6563985543d34f (diff) | |
QAR-1619: Remove unneeded llfloatertos.h #includes.
Neither lllogininstance.cpp nor lllogininstance_test.cpp need llfloatertos.h
any more, since LLLoginInstance talks to LLFloaterTOS only via LLFloaterReg
and LLEventPumps. However, both sources depended on llfloatertos.h dragging in
llnotifications.h, so include that explicitly instead of llfloatertos.h.
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/tests/lllogininstance_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index e56d28e066..8bf769a132 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -50,7 +50,7 @@ #include "llviewercontrol.h" #include "llurlsimstring.h" #include "llfloaterreg.h" -#include "llfloatertos.h" +#include "llnotifications.h" #include "llwindow.h" #if LL_LINUX || LL_SOLARIS #include "lltrans.h" diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index a84e796159..75db76df27 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -91,7 +91,7 @@ LLURLSimString LLURLSimString::sInstance; bool LLURLSimString::parse() { return true; }
//-----------------------------------------------------------------------------
-#include "../llfloatertos.h"
+#include "llnotifications.h"
#include "llfloaterreg.h"
static std::string gTOSType;
static LLEventPump * gTOSReplyPump = NULL;
|