diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 488bd45d8f2aeb1836f78509a5e51a2ef2bd60ca..d2409375e3f913f4b3e125b69ec1a32c341b201f 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 ae301af9f5ecc41ca4aa36db5d971be2f5864309..751e2deb846ea5aa3eb5c425a57f2871c6a9ba28 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 }; diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 04d50929f7891813af13f25eea9141f05518f2e9..965ac2111041a70fda6ca6453f4020d485fb7d06 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1407,6 +1407,10 @@ Only large parcels can be listed in search. label="Shopping" name="item11" value="shopping" /> + <combo_box.item + label="Rental" + name="item13" + value="rental" /> <combo_box.item label="Other" name="item12" @@ -1464,6 +1468,10 @@ Only large parcels can be listed in search. label="Shopping" name="item11" value="shopping" /> + <combo_box.item + label="Rental" + name="item13" + value="rental" /> <combo_box.item label="Other" name="item12" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 70a40960a1307a38970707af9957857de99217f7..c0d5f93f83627918550552b6cba6ac5c5173f82e 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2370,6 +2370,7 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh <!--<string name="Shopping">Shopping</string> --> <string name="Stage">Stage</string> <string name="Other">Other</string> + <string name="Rental">Rental</string> <string name="Any">Any</string> <string name="You">You</string>