diff options
| author | Maki <maki@hotmilk.space> | 2024-05-15 20:58:28 -0400 |
|---|---|---|
| committer | Maki <maki@hotmilk.space> | 2024-05-15 20:58:28 -0400 |
| commit | ec23d45e2e9a87147641fed6f8c3ef6083c2f878 (patch) | |
| tree | 169edbab006d8bbd86b2980ab98fb62e097067ff /indra/llinventory/llinventorysettings.cpp | |
| parent | 8d824e8923b26c7a1d858e6cb587be1cf7d4dfeb (diff) | |
| parent | 2f25f87ee719a79efc8316079f3c881eddb4d266 (diff) | |
Merge branch 'release/maint-b' into pipewire-linux-volume-catcher
Diffstat (limited to 'indra/llinventory/llinventorysettings.cpp')
| -rw-r--r-- | indra/llinventory/llinventorysettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llinventorysettings.cpp b/indra/llinventory/llinventorysettings.cpp index bc604097da..a436a7ab95 100644 --- a/indra/llinventory/llinventorysettings.cpp +++ b/indra/llinventory/llinventorysettings.cpp @@ -65,7 +65,7 @@ class LLSettingsDictionary : public LLSingleton<LLSettingsDictionary>, void initSingleton() override; }; -LLSettingsDictionary::LLSettingsDictionary() +LLSettingsDictionary::LLSettingsDictionary() { } @@ -98,7 +98,7 @@ LLSettingsType::type_e LLSettingsType::fromInventoryFlags(U32 flags) LLInventoryType::EIconName LLSettingsType::getIconName(LLSettingsType::type_e type) { const SettingsEntry *entry = LLSettingsDictionary::instance().lookup(type); - if (!entry) + if (!entry) return getIconName(ST_INVALID); return entry->mIconName; } |
