diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-17 01:27:44 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-17 01:27:44 +0000 |
| commit | 88126805c7a39f00004dcb4b0d4e998c43d663c3 (patch) | |
| tree | a12d689c8c0369de6f3db6988927757fe8721085 /indra/newview/llfloaterinventory.cpp | |
| parent | 6a198eed3b784a0495e9710288bddcf73b44ae15 (diff) | |
Eliminated old (stale) llinventoryview.cpp and merged changes to it into llfloaterinventory.cpp.
Diffstat (limited to 'indra/newview/llfloaterinventory.cpp')
| -rw-r--r-- | indra/newview/llfloaterinventory.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp index 634126202f..d326e0e970 100644 --- a/indra/newview/llfloaterinventory.cpp +++ b/indra/newview/llfloaterinventory.cpp @@ -1208,6 +1208,12 @@ const std::string& get_item_icon_name(LLAssetType::EType asset_type, //TODO - need bette idx idx = LANDMARK_ICON_NAME; break; + case LLAssetType::AT_LINK: + idx = BODYPART_ICON_NAME; // Seraph replace this with broken item link icon + break; + case LLAssetType::AT_LINK_FOLDER: + idx = BODYPART_ICON_NAME; // Seraph replace this with broken folder link icon + break; default: break; } @@ -1316,10 +1322,13 @@ BOOL LLInventoryPanel::postBuild() LLInventoryPanel::~LLInventoryPanel() { // should this be a global setting? - U32 sort_order = mFolders->getSortOrder(); - if (mSortOrderSetting != INHERIT_SORT_ORDER) + if (mFolders) { - gSavedSettings.setU32(mSortOrderSetting, sort_order); + U32 sort_order = mFolders->getSortOrder(); + if (mSortOrderSetting != INHERIT_SORT_ORDER) + { + gSavedSettings.setU32(mSortOrderSetting, sort_order); + } } // LLView destructor will take care of the sub-views. |