diff options
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llinventorysettings.cpp | 8 | ||||
| -rw-r--r-- | indra/llinventory/llinventorysettings.h | 1 | 
2 files changed, 8 insertions, 1 deletions
diff --git a/indra/llinventory/llinventorysettings.cpp b/indra/llinventory/llinventorysettings.cpp index 8887c23a6c..fdad50e8d4 100644 --- a/indra/llinventory/llinventorysettings.cpp +++ b/indra/llinventory/llinventorysettings.cpp @@ -89,7 +89,6 @@ LLSettingsType::type_e LLSettingsType::fromInventoryFlags(U32 flags)      return  (LLSettingsType::type_e)(flags & LLInventoryItemFlags::II_FLAGS_SUBTYPE_MASK);  } -  LLInventoryType::EIconName LLSettingsType::getIconName(LLSettingsType::type_e type)  {      const SettingsEntry *entry = LLSettingsDictionary::instance().lookup(type); @@ -98,6 +97,13 @@ LLInventoryType::EIconName LLSettingsType::getIconName(LLSettingsType::type_e ty      return entry->mIconName;  } +std::string LLSettingsType::getDefaultName(LLSettingsType::type_e type) +{ +    const SettingsEntry *entry = LLSettingsDictionary::instance().lookup(type); +    if (!entry) +        return getDefaultName(ST_INVALID); +    return entry->mDefaultNewName; +}  void LLSettingsType::initClass(LLTranslationBridge::ptr_t &trans)  { diff --git a/indra/llinventory/llinventorysettings.h b/indra/llinventory/llinventorysettings.h index fb08190ea9..906540689c 100644 --- a/indra/llinventory/llinventorysettings.h +++ b/indra/llinventory/llinventorysettings.h @@ -46,6 +46,7 @@ public:      static type_e fromInventoryFlags(U32 flags);      static LLInventoryType::EIconName getIconName(type_e type); +    static std::string getDefaultName(type_e type);      static void initClass(LLTranslationBridge::ptr_t &trans);      static void cleanupClass();  | 
