diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llpanelobject.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 62115be473..b181aff62d 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -99,7 +99,7 @@ enum { }; //*TODO:translate (depricated, so very low priority) -static const LLString LEGACY_FULLBRIGHT_DESC("Fullbright (Legacy)"); +static const std::string LEGACY_FULLBRIGHT_DESC("Fullbright (Legacy)"); BOOL LLPanelObject::postBuild() { @@ -429,7 +429,7 @@ void LLPanelObject::getState( ) BOOL owners_identical; LLUUID owner_id; - LLString owner_name; + std::string owner_name; owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name); // BUG? Check for all objects being editable? @@ -538,7 +538,7 @@ void LLPanelObject::getState( ) mComboMaterial->remove(LEGACY_FULLBRIGHT_DESC); } // *TODO:Translate - mComboMaterial->setSimple(LLString(LLMaterialTable::basic.getName(material_code))); + mComboMaterial->setSimple(std::string(LLMaterialTable::basic.getName(material_code))); } } else @@ -1191,10 +1191,10 @@ void LLPanelObject::onCommitMaterial( LLUICtrl* ctrl, void* userdata ) if (box) { // apply the currently selected material to the object - const LLString& material_name = box->getSimple(); + const std::string& material_name = box->getSimple(); if (material_name != LEGACY_FULLBRIGHT_DESC) { - U8 material_code = LLMaterialTable::basic.getMCode(material_name.c_str()); + U8 material_code = LLMaterialTable::basic.getMCode(material_name); LLSelectMgr::getInstance()->selectionSetMaterial(material_code); } } |