Skip to content
Snippets Groups Projects
Commit ead15a8f authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

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.
parent 4436e808
No related branches found
No related tags found
No related merge requests found
......@@ -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
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment