diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:29:40 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:29:40 -0500 |
| commit | 790dfe7556a476b502ef3a0ea921efdd11735f28 (patch) | |
| tree | 3db004c2acdfcf32f01abbf284e6dbd67c61a4c8 /indra/newview/tests | |
| parent | 6a3d06deca73683514d4668f78adf684d760708c (diff) | |
| parent | 4652e26196ed43e3a2fdd5bbb2e6c4b6b8466719 (diff) | |
merge changes for storm-844
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 { |