summaryrefslogtreecommitdiff
path: root/indra/llui/tests/llurlentry_test.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-03-13 16:38:00 -0400
committerNat Goodspeed <nat@lindenlab.com>2017-03-13 16:38:00 -0400
commit66de0c9965ff68bcb8cb60975fcffa45e2c6d74c (patch)
treee3fa6c87fe70e487b6fc6e94f6793b7638b568ea /indra/llui/tests/llurlentry_test.cpp
parent49e114748fdb52599aaa141c2006198c48aa083b (diff)
parent17c8eadb3d89bc78019f0b50eb8b109f25616781 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llui/tests/llurlentry_test.cpp')
-rw-r--r--indra/llui/tests/llurlentry_test.cpp4
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
{