diff options
| author | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 13:35:06 -0800 |
|---|---|---|
| committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 13:35:06 -0800 |
| commit | 189c0430383aa92fe839d6ed144d916886360407 (patch) | |
| tree | d2fae98d1f6ac03fdd39151c50b52c971deadf59 /indra/llui | |
| parent | 238f9350b8fec05a170ce0cf93e50783b07a5abf (diff) | |
| parent | a971909a3429a8944387ede557ed46e939cf0e8f (diff) | |
Automated merge with lindenlab/viewer64
Diffstat (limited to 'indra/llui')
| -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 { |