diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-03 23:25:03 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-03 23:25:03 -0800 |
| commit | 5cb2d63979f0ff72cb9351dc9aa070b1990a1f9c (patch) | |
| tree | c56a0d9205c675a6c3836f4a9b7e2dcb4ae7782e /indra/llinventory | |
| parent | 6fb3cf0d3ae490ec46b2b3006960a688ead6d1e6 (diff) | |
| parent | 24c908483cb1fdceeb222129c4f329969779d6ca (diff) | |
STORM-969 : pull into viewer-development
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llparcel.cpp | 2 | ||||
| -rw-r--r-- | indra/llinventory/llparcel.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 488bd45d8f..d2409375e3 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -72,6 +72,7 @@ static const std::string PARCEL_CATEGORY_STRING[LLParcel::C_COUNT] = "shopping", "stage", "other", + "rental" }; static const std::string PARCEL_CATEGORY_UI_STRING[LLParcel::C_COUNT + 1] = { @@ -89,6 +90,7 @@ static const std::string PARCEL_CATEGORY_UI_STRING[LLParcel::C_COUNT + 1] = "Shopping", "Stage", "Other", + "Rental", "Any", // valid string for parcel searches }; diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index ae301af9f5..751e2deb84 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -165,6 +165,7 @@ public: C_SHOPPING, C_STAGE, C_OTHER, + C_RENTAL, C_COUNT, C_ANY = -1 // only useful in queries }; |