summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-11-13 09:07:14 -0800
committerJames Cook <james@lindenlab.com>2009-11-13 09:07:14 -0800
commit543fdfd512ae63a6a2e077c50027fc5ceb0a8e2a (patch)
tree4e567d9f7b81f6c7b1766bbf0cf46af3f3f5eda4
parent20c0a0b68f82908bc73872ec132775e8c69cca4d (diff)
More explicit test code for dummy widget creation.
Added "Inspectors Test" back to login debug menu.
-rw-r--r--indra/newview/llfloatertestinspectors.cpp3
-rw-r--r--indra/newview/skins/default/xui/en/menu_login.xml7
2 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llfloatertestinspectors.cpp b/indra/newview/llfloatertestinspectors.cpp
index e68faba712..09996b0b92 100644
--- a/indra/newview/llfloatertestinspectors.cpp
+++ b/indra/newview/llfloatertestinspectors.cpp
@@ -53,7 +53,8 @@ LLFloaterTestInspectors::~LLFloaterTestInspectors()
BOOL LLFloaterTestInspectors::postBuild()
{
- getChild<LLUICtrl>("intentionally-not-found");
+ // Test the dummy widget construction code
+ getChild<LLUICtrl>("intentionally-not-found")->setEnabled(true);
// getChild<LLUICtrl>("avatar_2d_btn")->setCommitCallback(
// boost::bind(&LLFloaterTestInspectors::onClickAvatar2D, this));
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index bd60574a95..07940e18b6 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -193,6 +193,13 @@
function="ShowFloater"
parameter="test_widgets" />
</menu_item_call>
+ <menu_item_call
+ label="Inspectors Test"
+ name="Inspectors Test">
+ <menu_item_call.on_click
+ function="ShowFloater"
+ parameter="test_inspectors" />
+ </menu_item_call>
<menu_item_check
label="Reg In Client Test (restart)"
name="Reg In Client Test (restart)">