Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support for new 'rental' parcel category.

Browse Source
This commit is contained in:
Shyotl
2011-04-28 01:18:08 -05:00
parent ab35a07f0e
commit 0909a4ddbe
6 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llinventory/llparcel.cpp
View File

@@ -79,23 +79,25 @@ 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] =
{
"None",
"Linden Location",
"Adult",
"Arts & Culture",
"Arts and Culture",
"Business",
"Educational",
"Gaming",
"Hangout",
"Newcomer Friendly",
"Parks & Nature",
"Parks and Nature",
"Residential",
"Shopping",
"Stage",
"Other",
"Rental",
"Any", // valid string for parcel searches
};
@@ -690,8 +692,8 @@ void LLParcel::packMessage(LLSD& msg)
msg["auto_scale"] = getMediaAutoScale();
msg["media_loop"] = getMediaLoop();
msg["media_current_url"] = getMediaCurrentURL();
msg["obscure_media"] = FALSE; // OBSOLETE - no longer used
msg["obscure_music"] = FALSE; // OBSOLETE - no longer used
msg["obscure_media"] = false; // OBSOLETE - no longer used
msg["obscure_music"] = false; // OBSOLETE - no longer used
msg["media_id"] = getMediaID();
msg["media_allow_navigate"] = getMediaAllowNavigate();
msg["media_prevent_camera_zoom"] = getMediaPreventCameraZoom();

3
indra/llinventory/llparcel.h
View File

@@ -170,6 +170,7 @@ public:
C_SHOPPING,
C_STAGE,
C_OTHER,
C_RENTAL,
C_COUNT,
C_ANY = -1 // only useful in queries
};
@@ -534,7 +535,7 @@ public:
static bool isAgentBlockedFromParcel(LLParcel* parcelp,
const LLUUID& agent_id,
const std::vector<LLUUID>& group_ids,
const uuid_vec_t& group_ids,
const BOOL is_agent_identified,
const BOOL is_agent_transacted,
const BOOL is_agent_ageverified);

14
indra/newview/skins/default/xui/en-us/floater_about_land.xml
View File

@@ -653,7 +653,7 @@ Only large parcels can be listed in search.
Adult
</combo_item>
<combo_item name="Arts&amp;Culture" value="arts">
Arts &amp; Culture
Arts and Culture
</combo_item>
<combo_item name="Business" value="store">
Business
@@ -671,7 +671,7 @@ Only large parcels can be listed in search.
Newcomer Friendly
</combo_item>
<combo_item name="Parks&amp;Nature" value="park">
Parks &amp; Nature
Parks and Nature
</combo_item>
<combo_item name="Residential" value="home">
Residential
@@ -682,6 +682,9 @@ Only large parcels can be listed in search.
<combo_item name="Other" value="other">
Other
</combo_item>
<combo_item name="Rental" value="rental">
Rental
</combo_item>
</combo_box>
<!-- The following combo box is identical to the previous one, except for the
fact that the Adult item is missing. This seems to be the only way to safely
@@ -697,7 +700,7 @@ Only large parcels can be listed in search.
Linden Location
</combo_item>
<combo_item name="Arts&amp;Culture" value="arts">
Arts &amp; Culture
Arts and Culture
</combo_item>
<combo_item name="Business" value="store">
Business
@@ -715,7 +718,7 @@ Only large parcels can be listed in search.
Newcomer Friendly
</combo_item>
<combo_item name="Parks&amp;Nature" value="park">
Parks &amp; Nature
Parks and Nature
</combo_item>
<combo_item name="Residential" value="home">
Residential
@@ -726,6 +729,9 @@ Only large parcels can be listed in search.
<combo_item name="Other" value="other">
Other
</combo_item>
<combo_item name="Rental" value="rental">
Rental
</combo_item>
</combo_box>
<button bottom="-140" enabled="true" follows="left|top" font="SansSerif"
halign="center" height="18" label="?" label_selected="?" left="400"

14
indra/newview/skins/default/xui/en-us/floater_directory.xml
View File

@@ -477,7 +477,7 @@ To buy direct, visit the land and click on the place name in the title bar.
Linden Location
</combo_item>
<combo_item name="Arts&amp;Culture" value="arts">
Arts &amp; Culture
Arts and Culture
</combo_item>
<combo_item name="Business" value="store">
Business
@@ -495,7 +495,7 @@ To buy direct, visit the land and click on the place name in the title bar.
Newcomer Friendly
</combo_item>
<combo_item name="Parks&amp;Nature" value="park">
Parks &amp; Nature
Parks and Nature
</combo_item>
<combo_item name="Residential" value="home">
Residential
@@ -506,6 +506,9 @@ To buy direct, visit the land and click on the place name in the title bar.
<combo_item name="Other" value="other">
Other
</combo_item>
<combo_item name="Rental" value="rental">
Rental
</combo_item>
</combo_box>
<!-- This is used only during the AO transition and can be deleted once the AO transition is
complete. It is identical to the combo box above except that it has the Adult category.
@@ -522,7 +525,7 @@ To buy direct, visit the land and click on the place name in the title bar.
Adult
</combo_item>
<combo_item name="Arts&amp;Culture" value="arts">
Arts &amp; Culture
Arts and Culture
</combo_item>
<combo_item name="Business" value="store">
Business
@@ -540,7 +543,7 @@ To buy direct, visit the land and click on the place name in the title bar.
Newcomer Friendly
</combo_item>
<combo_item name="Parks&amp;Nature" value="park">
Parks &amp; Nature
Parks and Nature
</combo_item>
<combo_item name="Residential" value="home">
Residential
@@ -551,6 +554,9 @@ To buy direct, visit the land and click on the place name in the title bar.
<combo_item name="Other" value="other">
Other
</combo_item>
<combo_item name="Rental" value="rental">
Rental
</combo_item>
</combo_box>
<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
label="Search" label_selected="Search" left="121" mouse_opaque="true"

14
indra/newview/skins/default/xui/en-us/floater_directory2.xml
View File

@@ -419,7 +419,7 @@ To buy direct, visit the land and click on the place name in the title bar.
Official Location
</combo_item>
<combo_item name="Arts&amp;Culture" value="arts">
Arts &amp; Culture
Artsand Culture
</combo_item>
<combo_item name="Business" value="store">
Business
@@ -437,7 +437,7 @@ To buy direct, visit the land and click on the place name in the title bar.
Newcomer Friendly
</combo_item>
<combo_item name="Parks&amp;Nature" value="park">
Parks &amp; Nature
Parks and Nature
</combo_item>
<combo_item name="Residential" value="home">
Residential
@@ -448,6 +448,9 @@ To buy direct, visit the land and click on the place name in the title bar.
<combo_item name="Other" value="other">
Other
</combo_item>
<combo_item name="Rental" value="rental">
Rental
</combo_item>
</combo_box>
<!-- This is used only during the AO transition and can be deleted once the AO transition is
complete. It is identical to the combo box above except that it has the Adult category.
@@ -464,7 +467,7 @@ To buy direct, visit the land and click on the place name in the title bar.
Adult
</combo_item>
<combo_item name="Arts&amp;Culture" value="arts">
Arts &amp; Culture
Arts and Culture
</combo_item>
<combo_item name="Business" value="store">
Business
@@ -482,7 +485,7 @@ To buy direct, visit the land and click on the place name in the title bar.
Newcomer Friendly
</combo_item>
<combo_item name="Parks&amp;Nature" value="park">
Parks &amp; Nature
Parks and Nature
</combo_item>
<combo_item name="Residential" value="home">
Residential
@@ -493,6 +496,9 @@ To buy direct, visit the land and click on the place name in the title bar.
<combo_item name="Other" value="other">
Other
</combo_item>
<combo_item name="Rental" value="rental">
Rental
</combo_item>
</combo_box>
<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
label="Search" label_selected="Search" left="121" mouse_opaque="true"

14
indra/newview/skins/default/xui/en-us/floater_directory3.xml
View File

@@ -535,7 +535,7 @@ To buy direct, visit the land and click on the place name in the title bar.
Official Location
</combo_item>
<combo_item name="Arts&amp;Culture" value="arts">
Arts &amp; Culture
Arts and Culture
</combo_item>
<combo_item name="Business" value="store">
Business
@@ -553,7 +553,7 @@ To buy direct, visit the land and click on the place name in the title bar.
Newcomer Friendly
</combo_item>
<combo_item name="Parks&amp;Nature" value="park">
Parks &amp; Nature
Parks and Nature
</combo_item>
<combo_item name="Residential" value="home">
Residential
@@ -564,6 +564,9 @@ To buy direct, visit the land and click on the place name in the title bar.
<combo_item name="Other" value="other">
Other
</combo_item>
<combo_item name="Rental" value="rental">
Rental
</combo_item>
</combo_box>
<!-- This is used only during the AO transition and can be deleted once the AO transition is
complete. It is identical to the combo box above except that it has the Adult category.
@@ -580,7 +583,7 @@ To buy direct, visit the land and click on the place name in the title bar.
Adult
</combo_item>
<combo_item name="Arts&amp;Culture" value="arts">
Arts &amp; Culture
Arts and Culture
</combo_item>
<combo_item name="Business" value="store">
Business
@@ -598,7 +601,7 @@ To buy direct, visit the land and click on the place name in the title bar.
Newcomer Friendly
</combo_item>
<combo_item name="Parks&amp;Nature" value="park">
Parks &amp; Nature
Parks and Nature
</combo_item>
<combo_item name="Residential" value="home">
Residential
@@ -609,6 +612,9 @@ To buy direct, visit the land and click on the place name in the title bar.
<combo_item name="Other" value="other">
Other
</combo_item>
<combo_item name="Rental" value="rental">
Rental
</combo_item>
</combo_box>
<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
label="Search" label_selected="Search" left="121" mouse_opaque="true"