summaryrefslogtreecommitdiff
path: root/indra/newview/llcompilequeue.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-08-26 16:52:32 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-08-26 16:52:32 +0300
commit19fb0a16695b57e70dc371471d37c16929f1c424 (patch)
tree39f16d806b66e3795ded41c1462e205404996046 /indra/newview/llcompilequeue.cpp
parent8e56f063924601041bac3791e794fa6934f20936 (diff)
parent1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff)
Manual merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llcompilequeue.cpp')
-rw-r--r--indra/newview/llcompilequeue.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp
index 117a0bb568..268d9958d1 100644
--- a/indra/newview/llcompilequeue.cpp
+++ b/indra/newview/llcompilequeue.cpp
@@ -100,7 +100,7 @@ LLFloaterScriptQueue::~LLFloaterScriptQueue()
BOOL LLFloaterScriptQueue::postBuild()
{
childSetAction("close",onCloseBtn,this);
- childSetEnabled("close",FALSE);
+ getChildView("close")->setEnabled(FALSE);
return TRUE;
}
@@ -213,7 +213,7 @@ BOOL LLFloaterScriptQueue::nextObject()
{
mDone = true;
getChild<LLScrollListCtrl>("queue output")->setCommentText(getString("Done"));
- childSetEnabled("close",TRUE);
+ getChildView("close")->setEnabled(TRUE);
}
return successful_start;
}