diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 19:18:15 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 19:18:15 -0800 |
| commit | a2efe4bb4154b7ecb9c7cb279f7a28d7d401a93a (patch) | |
| tree | 4cafd0e64a9c45b444664d12f022cd3e675bfebd /indra/newview/llfloaterproperties.cpp | |
| parent | 5352954eb65076d877cc74d4328620e910b93d1c (diff) | |
| parent | 1ae70e112a466a6ed5baf4e05c1771218c78b2f5 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llfloaterproperties.cpp')
| -rw-r--r-- | indra/newview/llfloaterproperties.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp index ff9002787c..5c0593ad29 100644 --- a/indra/newview/llfloaterproperties.cpp +++ b/indra/newview/llfloaterproperties.cpp @@ -130,9 +130,9 @@ BOOL LLFloaterProperties::postBuild() { // build the UI // item name & description - childSetPrevalidate("LabelItemName",&LLLineEditor::prevalidateASCIIPrintableNoPipe); + childSetPrevalidate("LabelItemName",&LLTextValidate::validateASCIIPrintableNoPipe); getChild<LLUICtrl>("LabelItemName")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitName,this)); - childSetPrevalidate("LabelItemDesc",&LLLineEditor::prevalidateASCIIPrintableNoPipe); + childSetPrevalidate("LabelItemDesc",&LLTextValidate::validateASCIIPrintableNoPipe); getChild<LLUICtrl>("LabelItemDesc")->setCommitCallback(boost::bind(&LLFloaterProperties:: onCommitDescription, this)); // Creator information getChild<LLUICtrl>("BtnCreator")->setCommitCallback(boost::bind(&LLFloaterProperties::onClickCreator,this)); @@ -880,7 +880,11 @@ void LLFloaterProperties::dirtyAll() iter != inst_list.end(); ++iter) { LLFloaterProperties* floater = dynamic_cast<LLFloaterProperties*>(*iter); - floater->dirty(); + llassert(floater); // else cast failed - wrong type D: + if (floater) + { + floater->dirty(); + } } } |