From a030b30d34ef3152791b123c4f52d4086f3eb549 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 6 Mar 2014 18:15:51 -0800
Subject: DD-4, DD-5, DD-6, DD-7, DD-8: WIP : Add Merchant Items panel and make
it somewhat work, in a clunky sort of way
---
indra/llcommon/llfoldertype.cpp | 2 ++
indra/llcommon/llfoldertype.h | 2 ++
2 files changed, 4 insertions(+)
(limited to 'indra/llcommon')
diff --git a/indra/llcommon/llfoldertype.cpp b/indra/llcommon/llfoldertype.cpp
index 9c38349cf7..64bc17c422 100755
--- a/indra/llcommon/llfoldertype.cpp
+++ b/indra/llcommon/llfoldertype.cpp
@@ -96,6 +96,8 @@ LLFolderDictionary::LLFolderDictionary()
addEntry(LLFolderType::FT_OUTBOX, new FolderEntry("outbox", FALSE));
addEntry(LLFolderType::FT_BASIC_ROOT, new FolderEntry("basic_rt", TRUE));
+
+ addEntry(LLFolderType::FT_MERCHANT_ITEMS, 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 a0c847914f..81f9c0b678 100644
--- a/indra/llcommon/llfoldertype.h
+++ b/indra/llcommon/llfoldertype.h
@@ -87,6 +87,8 @@ public:
FT_BASIC_ROOT = 52,
+ FT_MERCHANT_ITEMS = 53,
+
FT_COUNT,
FT_NONE = -1
--
cgit v1.2.3
From 705d4182c8a84728e7f00cf48110c8f9720e4c29 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 13 Mar 2014 16:45:52 -0700
Subject: DD-42 : Rename merchant items to marketplace listings to be
consistent with spec
---
indra/llcommon/llfoldertype.cpp | 2 +-
indra/llcommon/llfoldertype.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra/llcommon')
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,
--
cgit v1.2.3
From 0ec8fbec6deaa24506391ef239c50009eebe1eef Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 28 Mar 2014 15:54:36 -0700
Subject: DD-24 : Add FT_MARKETPLACE_STOCK as a new type for folders, implement
the promotion code for Drag and Drop, display of stock folders and embryonic
marketplace validation
---
indra/llcommon/llfoldertype.cpp | 1 +
indra/llcommon/llfoldertype.h | 1 +
2 files changed, 2 insertions(+)
(limited to 'indra/llcommon')
diff --git a/indra/llcommon/llfoldertype.cpp b/indra/llcommon/llfoldertype.cpp
index 5b80189d2a..afa9e59832 100755
--- a/indra/llcommon/llfoldertype.cpp
+++ b/indra/llcommon/llfoldertype.cpp
@@ -98,6 +98,7 @@ LLFolderDictionary::LLFolderDictionary()
addEntry(LLFolderType::FT_BASIC_ROOT, new FolderEntry("basic_rt", TRUE));
addEntry(LLFolderType::FT_MARKETPLACE_LISTINGS, new FolderEntry("merchant", FALSE));
+ addEntry(LLFolderType::FT_MARKETPLACE_STOCK, new FolderEntry("stock", FALSE));
addEntry(LLFolderType::FT_NONE, new FolderEntry("-1", FALSE));
};
diff --git a/indra/llcommon/llfoldertype.h b/indra/llcommon/llfoldertype.h
index 91dc1da543..20925eede0 100644
--- a/indra/llcommon/llfoldertype.h
+++ b/indra/llcommon/llfoldertype.h
@@ -88,6 +88,7 @@ public:
FT_BASIC_ROOT = 52,
FT_MARKETPLACE_LISTINGS = 53,
+ FT_MARKETPLACE_STOCK = 54,
FT_COUNT,
--
cgit v1.2.3
From 250f05861eeec06b864e57c1fda6a996b6a94029 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 21 Apr 2014 11:27:52 -0700
Subject: DD-66 : Use new icons for version folders and stock folder
---
indra/llcommon/llfoldertype.cpp | 1 +
indra/llcommon/llfoldertype.h | 1 +
2 files changed, 2 insertions(+)
(limited to 'indra/llcommon')
diff --git a/indra/llcommon/llfoldertype.cpp b/indra/llcommon/llfoldertype.cpp
index afa9e59832..965e4d9734 100755
--- a/indra/llcommon/llfoldertype.cpp
+++ b/indra/llcommon/llfoldertype.cpp
@@ -99,6 +99,7 @@ LLFolderDictionary::LLFolderDictionary()
addEntry(LLFolderType::FT_MARKETPLACE_LISTINGS, new FolderEntry("merchant", FALSE));
addEntry(LLFolderType::FT_MARKETPLACE_STOCK, new FolderEntry("stock", FALSE));
+ addEntry(LLFolderType::FT_MARKETPLACE_VERSION, new FolderEntry("version", FALSE));
addEntry(LLFolderType::FT_NONE, new FolderEntry("-1", FALSE));
};
diff --git a/indra/llcommon/llfoldertype.h b/indra/llcommon/llfoldertype.h
index 20925eede0..515bb05a3f 100644
--- a/indra/llcommon/llfoldertype.h
+++ b/indra/llcommon/llfoldertype.h
@@ -89,6 +89,7 @@ public:
FT_MARKETPLACE_LISTINGS = 53,
FT_MARKETPLACE_STOCK = 54,
+ FT_MARKETPLACE_VERSION = 55, // Note: We actually *never* create folders with that type. This is used for icon override only.
FT_COUNT,
--
cgit v1.2.3
From 618e13a2d6c5bd632892865fc3b88051c13a7658 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 2 Jan 2015 17:35:50 -0800
Subject: DD-297 : Performance on login : Refactored the code so that we have a
new LLMarketplaceFolderBridge class in the bridge model. Only the panels with
the use_marketplace_folders param flag will use that one.
---
indra/llcommon/llassettype.h | 3 +++
1 file changed, 3 insertions(+)
(limited to 'indra/llcommon')
diff --git a/indra/llcommon/llassettype.h b/indra/llcommon/llassettype.h
index 5a95a58d93..3a4b5dad18 100755
--- a/indra/llcommon/llassettype.h
+++ b/indra/llcommon/llassettype.h
@@ -107,6 +107,9 @@ public:
AT_LINK_FOLDER = 25,
// Inventory folder link
+ AT_MARKETPLACE_FOLDER = 26,
+ // Marketplace folder. Same as an AT_CATEGORY but different display methods.
+
AT_WIDGET = 40,
// UI Widget: this is *not* an inventory asset type, only a viewer side asset (e.g. button, other ui items...)
--
cgit v1.2.3