diff options
author | James Cook <james@lindenlab.com> | 2009-10-16 23:20:05 +0000 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-10-16 23:20:05 +0000 |
commit | a4c657a49dd055cdc773c95b04713f403ea9c44c (patch) | |
tree | ab4731917d9d330c636773d4ce5015f59dd070a4 /indra/newview/skins | |
parent | e3c4b5ad26e6c4583fc2a736aea1370cc06ac6b2 (diff) |
Group inspectors now work. They are hooked up to About Land, build tools floater, and anywhere secondlife:///app/group URLs appear. Reviewed with Leyla.
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_inspectors.xml | 30 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/inspect_group.xml | 106 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 4 |
3 files changed, 137 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml index 2011f57d8b..126bca2074 100644 --- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml +++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml @@ -93,7 +93,9 @@ top_pad="10" left_delta="0" height="20" - width="100"/> + width="100" + commit_callback.function="ShowGroupInspector" + commit_callback.parameter="" /> <button name="place_btn" label="Place" @@ -112,13 +114,35 @@ follows="left|top" font="SansSerif" height="20" - layout="topleft" left="0" max_length="65536" name="slurl" top_pad="4" - width="100"> + width="150"> secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect </text> + <text + follows="left|top" + font="SansSerif" + height="20" + left="0" + max_length="65536" + name="slurl_group" + top_pad="4" + width="150"> + secondlife:///app/group/00000000-0000-0000-0000-000000000000/inspect + </text> + + <text + follows="left|top" + font="SansSerif" + height="20" + left="0" + max_length="65536" + name="slurl_group_about" + top_pad="4" + width="150"> + secondlife:///app/group/00000000-0000-0000-0000-000000000000/about + </text> </floater> diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml new file mode 100644 index 0000000000..d3f599cbbf --- /dev/null +++ b/indra/newview/skins/default/xui/en/inspect_group.xml @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- + Not can_close / no title to avoid window chrome + Single instance - only have one at a time, recycle it each spawn +--> +<floater + bevel_style="in" + bg_opaque_color="MouseGray" + can_close="false" + can_minimize="false" + height="138" + layout="topleft" + name="inspect_group" + single_instance="true" + sound_flags="0" + visible="true" + width="245"> + <string name="PrivateGroup">Private group</string> + <string name="FreeToJoin">Free to join</string> + <string name="CostToJoin">L$[AMOUNT] to join</string> + <string name="YouAreMember">You are a member</string> + <text + follows="all" + font="SansSerifLargeBold" + height="18" + left="8" + name="group_name" + top="5" + text_color="white" + use_ellipses="true" + width="240" + word_wrap="false"> + Grumpity's Grumpy Group of Moose + </text> + <text + follows="all" + font="SansSerifSmallBold" + text_color="White" + height="18" + left="8" + name="group_subtitle" + use_ellipses="true" + top_pad="0" + width="170"> + 123 members + </text> + <text + follows="all" + height="50" + left="8" + name="group_details" + top_pad="0" + width="170" + word_wrap="true"> +A group of folks charged with creating a room with a moose. +Fear the moose! Fear it! And the mongoose too! + </text> + <text + follows="all" + height="15" + left="8" + name="group_cost" + top_pad="2" + width="170"> +L$123 to join + </text> + <icon + follows="all" + height="38" + right="-25" + mouse_opaque="true" + name="group_icon" + top="24" + width="38" /> + <button + follows="top|left" + height="18" + image_disabled="ForwardArrow_Disabled" + image_selected="ForwardArrow_Press" + image_unselected="ForwardArrow_Off" + name="view_profile_btn" + picture_style="true" + right="-8" + top="35" + left_delta="110" + tab_stop="false" + width="18" /> + <button + follows="bottom|left" + height="23" + label="Join" + left="8" + top="246" + name="join_btn" + width="100" + commit_callback.function="InspectGroup.Join"/> + <button + follows="bottom|left" + height="23" + label="Leave" + left="8" + top="246" + name="leave_btn" + width="100" + commit_callback.function="InspectGroup.Leave"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2a616d8e2f..d13f5dbde3 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1951,6 +1951,10 @@ this texture in your inventory <string name="AgeDaysA">[COUNT] day</string> <string name="AgeDaysB">[COUNT] days</string> <string name="AgeDaysC">[COUNT] days</string> + <!-- Group member counts --> + <string name="GroupMembersA">[COUNT] member</string> + <string name="GroupMembersB">[COUNT] members</string> + <string name="GroupMembersC">[COUNT] members</string> <!-- Account types, see LLAvatarPropertiesProcessor --> <string name="AcctTypeResident">Resident</string> |