diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-06-14 15:10:19 -0700 | 
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-06-14 15:10:19 -0700 | 
| commit | b0caa632cc479c6736efea995741e8334b9e766a (patch) | |
| tree | 6a201279a97a9075cfcc10fc52e271544a70c145 | |
| parent | c559e3d6b93216496065cd05dd2734b726d61201 (diff) | |
MAINT-840 VWR-28604 DEV-2548:  [PUBLIC]Object by multiple creators shows creator
as "(unknown)" in Inventory.   Now shows "(unknown / multiple)".  Reviewed by Kelly
| -rw-r--r-- | indra/newview/llsidepaneliteminfo.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_item_info.xml | 4 | 
2 files changed, 5 insertions, 1 deletions
| diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index 1ce05da849..92c2863ffd 100644 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -352,7 +352,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)  		getChildView("BtnCreator")->setEnabled(FALSE);  		getChildView("LabelCreatorTitle")->setEnabled(FALSE);  		getChildView("LabelCreatorName")->setEnabled(FALSE); -		getChild<LLUICtrl>("LabelCreatorName")->setValue(getString("unknown")); +		getChild<LLUICtrl>("LabelCreatorName")->setValue(getString("unknown_multiple"));  	}  	//////////////// diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index 54a312bd59..c5dfb703e5 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -11,6 +11,10 @@  		 name="unknown">          (unknown)  	</panel.string> +    <panel.string +         name="unknown_multiple"> +        (unknown / multiple) +    </panel.string>  	<panel.string  		 name="public">          (public) | 
