summaryrefslogtreecommitdiff
path: root/indra/newview/tests/lllogininstance_test.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-09-14 09:22:43 -0400
committerNat Goodspeed <nat@lindenlab.com>2009-09-14 09:22:43 -0400
commitb3ae33703b5daf0f930bc0ecb562bc62d9e5ae8f (patch)
tree4629adaef54af86d8ae656921fc78e35b823de76 /indra/newview/tests/lllogininstance_test.cpp
parent7dca49b0f238063b7396ead5dbd8206669a5934f (diff)
parent689af4b32948e2d2a07b60adcc318668c4d55585 (diff)
Merge changes
Diffstat (limited to 'indra/newview/tests/lllogininstance_test.cpp')
-rw-r--r--indra/newview/tests/lllogininstance_test.cpp2
1 files changed, 1 insertions, 1 deletions
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;