summaryrefslogtreecommitdiff
path: root/indra/newview/tests
diff options
context:
space:
mode:
authorleyla_linden <none@none>2011-01-19 11:39:25 -0800
committerleyla_linden <none@none>2011-01-19 11:39:25 -0800
commit17068766b75fbe7dac968705f4f383fb61f73eb4 (patch)
tree9a6923653b721311b61edac947b2e7682972cce3 /indra/newview/tests
parentca1c1eea78ff2ab83979a4308dd5a93ea0032fc8 (diff)
parenteec6071766e6fef7015610b002a9bcb09ce36836 (diff)
Merge
Diffstat (limited to 'indra/newview/tests')
-rw-r--r--indra/newview/tests/llremoteparcelrequest_test.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/tests/llremoteparcelrequest_test.cpp b/indra/newview/tests/llremoteparcelrequest_test.cpp
index dae22521bb..7862cce3a1 100644
--- a/indra/newview/tests/llremoteparcelrequest_test.cpp
+++ b/indra/newview/tests/llremoteparcelrequest_test.cpp
@@ -32,6 +32,7 @@
#include "../llagent.h"
#include "message.h"
+#include "llurlentry.h"
namespace {
LLControlGroup s_saved_settings("dummy_settings");
@@ -72,6 +73,7 @@ LLUIColor::LLUIColor(void) { }
LLAgentAccess::LLAgentAccess(LLControlGroup & settings) : mSavedSettings(settings) { }
LLControlGroup::LLControlGroup(std::string const & name) : LLInstanceTracker<LLControlGroup, std::string>(name) { }
LLControlGroup::~LLControlGroup(void) { }
+void LLUrlEntryParcel::processParcelInfo(const LLUrlEntryParcel::LLParcelData& parcel_data) { }
namespace tut
{