diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/llfloaternamedesc.cpp | |
parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llfloaternamedesc.cpp')
-rw-r--r-- | indra/newview/llfloaternamedesc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp index 1cac8fd4c5..2c7d40695b 100644 --- a/indra/newview/llfloaternamedesc.cpp +++ b/indra/newview/llfloaternamedesc.cpp @@ -45,7 +45,7 @@ #include "lldir.h" #include "llviewercontrol.h" #include "llviewermenufile.h" // upload_new_resource() -#include "llvieweruictrlfactory.h" +#include "lluictrlfactory.h" // linden includes #include "llassetstorage.h" @@ -119,7 +119,7 @@ BOOL LLFloaterNameDesc::postBuild() childSetCommitCallback("name_form", doCommit, this); childSetValue("name_form", LLSD(asset_name)); - LLLineEditor *NameEditor = LLViewerUICtrlFactory::getLineEditorByName(this, "name_form"); + LLLineEditor *NameEditor = getChild<LLLineEditor>("name_form"); if (NameEditor) { NameEditor->setMaxTextLength(DB_INV_ITEM_NAME_STR_LEN); @@ -131,7 +131,7 @@ BOOL LLFloaterNameDesc::postBuild() r.setLeftTopAndSize( PREVIEW_HPAD, y, line_width, PREVIEW_LINE_HEIGHT ); childSetCommitCallback("description_form", doCommit, this); - LLLineEditor *DescEditor = LLViewerUICtrlFactory::getLineEditorByName(this, "description_form"); + LLLineEditor *DescEditor = getChild<LLLineEditor>("description_form"); if (DescEditor) { DescEditor->setMaxTextLength(DB_INV_ITEM_DESC_STR_LEN); |