diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-07 09:35:57 -0800 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-07 09:35:57 -0800 |
| commit | fa4986e9781651626a6a467057509d653d98cf40 (patch) | |
| tree | 8ac6428b1aa0ad79e3ea52c9734d8202f169988b /indra/llinventory/llparcel.cpp | |
| parent | d413799644b8e7fa943fa86c7798634a28ce335d (diff) | |
| parent | 5cb2d63979f0ff72cb9351dc9aa070b1990a1f9c (diff) | |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/llinventory/llparcel.cpp')
| -rw-r--r-- | indra/llinventory/llparcel.cpp | 2 |
1 files changed, 2 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 }; |