diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-02-03 16:46:46 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-02-03 16:46:46 -0500 |
| commit | ead15a8ff5cfbfbb15f42c1f73910a3fa65d4741 (patch) | |
| tree | d6c04bf9b1d2065d1b6291a5ef23da1517347d9b /indra | |
| parent | 4436e808b16b873d21b40ccf3f9f52b352faeca0 (diff) | |
DRTVWR-418: Remove most (all?) of the "stubs" from llurlentry_test.
At some point the INTEGRATION_TEST_llurlentry build changed so that the
library(ies) we attempted to stub out got linked in anyway, so that instead of
simplifying the test, the stubs broke it with "duplicate symbol" errors.
Commenting out the stubs permits the test program to succeed.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/tests/llurlentry_test.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 233fb6da23..119cbebc81 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -28,7 +28,7 @@ #include "linden_common.h" #include "../llurlentry.h" #include "../lluictrl.h" -#include "llurlentry_stub.cpp" +//#include "llurlentry_stub.cpp" #include "lltut.h" #include "../lluicolortable.h" #include "../llrender/lluiimage.h" @@ -49,6 +49,7 @@ // // } +/*==========================================================================*| typedef std::map<std::string, LLControlGroup*> settings_map_t; settings_map_t LLUI::sSettingGroups; @@ -83,6 +84,7 @@ S32 LLUIImage::getHeight() const { return 0; } +|*==========================================================================*/ namespace tut { |