diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-17 10:30:36 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-17 10:30:36 -0500 |
commit | 74fdba829574e5132fec6633b0ddcd2feb9fe51e (patch) | |
tree | bf17dba56b38a3b228f6174f950e3d405b6329af /indra/newview/tests | |
parent | fe28f89e7e79b9de5a455b9c9833d243d8039774 (diff) | |
parent | 1d7b46e2c32c6bdf2e6cf5a8b9dcb0c8cb767b1b (diff) |
merge changes for vwr-24420
Diffstat (limited to 'indra/newview/tests')
-rw-r--r-- | indra/newview/tests/llremoteparcelrequest_test.cpp | 2 |
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 { |