summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-11-16 14:23:46 -0500
committerLoren Shih <seraph@lindenlab.com>2009-11-16 14:23:46 -0500
commit909125258dabd0722785519f689d20608bb13fc1 (patch)
tree42d18ae988dfd70022e272ee7843e61025e0b5f7 /indra/newview
parent85e142b949c83c674d316493ddaed71661e73066 (diff)
Minor cleanup, changed inventorypanel start folder special casing keyword "INVENTORY" to using generic "My Inventory" keyword.
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorypanel.cpp6
-rw-r--r--indra/newview/skins/default/xui/en/panel_landmarks.xml2
2 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 129178e42e..c113b9f0d0 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -149,11 +149,7 @@ BOOL LLInventoryPanel::postBuild()
// of that folder (i.e. not including the folder itself).
const LLFolderType::EType preferred_type = LLViewerFolderType::lookupTypeFromNewCategoryName(mStartFolderString);
- if ("INVENTORY" == mStartFolderString)
- {
- mStartFolderID = gInventory.getRootFolderID();
- }
- else if ("LIBRARY" == mStartFolderString)
+ if ("LIBRARY" == mStartFolderString)
{
mStartFolderID = gInventory.getLibraryRootFolderID();
}
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index f05684db10..4b91dc6294 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -63,7 +63,7 @@
left="0"
mouse_opaque="true"
name="my_inventory_list"
- start_folder="INVENTORY"
+ start_folder="My Inventory"
width="380"/>
</accordion_tab>
<accordion_tab