diff options
| author | coyot@coyot-sager-PC <coyot@coyot-sager-PC> | 2017-02-28 22:56:30 +0000 |
|---|---|---|
| committer | coyot@coyot-sager-PC <coyot@coyot-sager-PC> | 2017-02-28 22:56:30 +0000 |
| commit | 3a3da6e4a76859f32dc36491fde2992e92ae57b5 (patch) | |
| tree | f61a7417ad6ffcb8488c910cfa64f14afe979071 /indra/llui/tests/llurlentry_test.cpp | |
| parent | 069c938eb6ebfd77f6a415207331c66f72270e5f (diff) | |
| parent | f0b256b1cb6c96aed81ee456e505247fd2169c5f (diff) | |
merge
Diffstat (limited to 'indra/llui/tests/llurlentry_test.cpp')
| -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 { |