diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-25 01:35:31 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-25 01:35:31 -0500 |
| commit | 1e0155033372c6b16cfbe58449ed343a59ba5fd9 (patch) | |
| tree | 2ce74c1b58c06f524868eaa5ef54da1540d17172 /indra/newview | |
| parent | cd9d1685e952c762c55aee62c1e8c98ae7e26f68 (diff) | |
Fix for foldertype_bad_lookup nonsense (requires clearing of cache and bad_lookup folder and/or a fresh inventory copy from agni to take effect).
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llviewerfoldertype.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp index 1056db34ee..e5f504bfe7 100755 --- a/indra/newview/llviewerfoldertype.cpp +++ b/indra/newview/llviewerfoldertype.cpp @@ -132,7 +132,7 @@ LLViewerFolderDictionary::LLViewerFolderDictionary() addEntry(LLFolderType::FT_CURRENT_OUTFIT, new ViewerFolderEntry("Current Outfit", "Inv_SysOpen", "Inv_SysClosed", TRUE)); addEntry(LLFolderType::FT_OUTFIT, new ViewerFolderEntry("New Outfit", "Inv_LookFolderOpen", "Inv_LookFolderClosed", TRUE)); addEntry(LLFolderType::FT_MY_OUTFITS, new ViewerFolderEntry("My Outfits", "Inv_SysOpen", "Inv_SysClosed", TRUE)); - addEntry(LLFolderType::FT_MESH, new ViewerFolderEntry("Mesh", "Inv_SysOpen", "Inv_SysClosed", FALSE)); + addEntry(LLFolderType::FT_MESH, new ViewerFolderEntry("Meshes", "Inv_SysOpen", "Inv_SysClosed", FALSE)); addEntry(LLFolderType::FT_INBOX, new ViewerFolderEntry("Inbox", "Inv_SysOpen", "Inv_SysClosed", FALSE)); diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 4c5c84df71..a3a47666e5 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -197,6 +197,7 @@ <string name="favorite">favorite</string> <string name="symbolic link">link</string> <string name="symbolic folder link">folder link</string> + <string name="mesh">mesh</string> <!-- llvoavatar. Displayed in the avatar chat bubble --> <string name="AvatarEditingAppearance">(Editing Appearance)</string> |