diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-13 16:45:52 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-13 16:45:52 -0700 |
| commit | 705d4182c8a84728e7f00cf48110c8f9720e4c29 (patch) | |
| tree | 1666346cc9031c54020f10db9d033d796680bcc8 /indra/llcommon | |
| parent | 9de02b0cd3ac05ce172e12dbc2d288a5deccba11 (diff) | |
DD-42 : Rename merchant items to marketplace listings to be consistent with spec
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/llfoldertype.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/llfoldertype.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llfoldertype.cpp b/indra/llcommon/llfoldertype.cpp index 64bc17c422..5b80189d2a 100755 --- a/indra/llcommon/llfoldertype.cpp +++ b/indra/llcommon/llfoldertype.cpp @@ -97,7 +97,7 @@ LLFolderDictionary::LLFolderDictionary() addEntry(LLFolderType::FT_BASIC_ROOT, new FolderEntry("basic_rt", TRUE)); - addEntry(LLFolderType::FT_MERCHANT_ITEMS, new FolderEntry("merchant", FALSE)); + addEntry(LLFolderType::FT_MARKETPLACE_LISTINGS, new FolderEntry("merchant", FALSE)); addEntry(LLFolderType::FT_NONE, new FolderEntry("-1", FALSE)); }; diff --git a/indra/llcommon/llfoldertype.h b/indra/llcommon/llfoldertype.h index 81f9c0b678..91dc1da543 100644 --- a/indra/llcommon/llfoldertype.h +++ b/indra/llcommon/llfoldertype.h @@ -87,7 +87,7 @@ public: FT_BASIC_ROOT = 52, - FT_MERCHANT_ITEMS = 53, + FT_MARKETPLACE_LISTINGS = 53, FT_COUNT, |