diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 18:35:29 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 18:35:29 +0000 |
| commit | 1fcc26d570435817b0ce8c84dbec590b960298be (patch) | |
| tree | 57292cc7de51a343ad2460661cbdc3f85f5a1d10 /indra/newview | |
| parent | 3aa6150e80287a41e2b48b9bf30f86dfc025277a (diff) | |
CID-141
Checker: NULL_RETURNS
Function: LLFolderBridge::folderOptionsMenu()
File: /indra/newview/llinventorybridge.cpp
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 749e1ce3f3..da95eaefca 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2506,11 +2506,13 @@ void LLFolderBridge::folderOptionsMenu() if(!model) return; const LLInventoryCategory* category = model->getCategory(mUUID); + if(!category) return; + LLFolderType::EType type = category->getPreferredType(); - const bool is_system_folder = category && LLFolderType::lookupIsProtectedType(type); + const bool is_system_folder = LLFolderType::lookupIsProtectedType(type); // BAP change once we're no longer treating regular categories as ensembles. - const bool is_ensemble = category && (type == LLFolderType::FT_NONE || - LLFolderType::lookupIsEnsembleType(type)); + const bool is_ensemble = (type == LLFolderType::FT_NONE || + LLFolderType::lookupIsEnsembleType(type)); // calling card related functionality for folders. |