diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/newview/llfloaterreporter.cpp | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/newview/llfloaterreporter.cpp')
| -rw-r--r-- | indra/newview/llfloaterreporter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 0d62b93ed5..a7cd2114e0 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -177,8 +177,8 @@ LLFloaterReporter::LLFloaterReporter( setVisible(TRUE); // Default text to be blank - childSetText("object_name", ""); - childSetText("owner_name", ""); + childSetText("object_name", LLString::null); + childSetText("owner_name", LLString::null); childSetFocus("summary_edit"); @@ -461,8 +461,8 @@ void LLFloaterReporter::onClickObjPicker(void *userdata) gToolObjPicker->setExitCallback(LLFloaterReporter::closePickTool, self); gToolMgr->setTransientTool(gToolObjPicker); self->mPicking = TRUE; - self->childSetText("object_name", ""); - self->childSetText("owner_name", ""); + self->childSetText("object_name", LLString::null); + self->childSetText("owner_name", LLString::null); LLButton* pick_btn = LLUICtrlFactory::getButtonByName(self, "pick_btn"); if (pick_btn) pick_btn->setToggleState(TRUE); } @@ -581,7 +581,7 @@ LLFloaterReporter* LLFloaterReporter::createNewBugReporter() -void LLFloaterReporter::setPickedObjectProperties(const char *object_name, const char *owner_name, const LLUUID owner_id) +void LLFloaterReporter::setPickedObjectProperties(const LLString& object_name, const LLString& owner_name, const LLUUID owner_id) { childSetText("object_name", object_name); childSetText("owner_name", owner_name); |