livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

master
richard 2009-12-08 18:43:57 -08:00
parent 7a05356749 92ca569b42
commit be45239d00
10 changed files with 161 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
indra/newview/llfloaterpreference.cpp
View File

@ -251,7 +251,7 @@ bool callback_skip_dialogs(const LLSD& notification, const LLSD& response, LLFlo
{
floater->setAllIgnored();
LLFirstUse::disableFirstUse();
LLFloaterPreference::buildLists(floater);
floater->buildPopupLists();
}
}
return false;
@ -266,7 +266,7 @@ bool callback_reset_dialogs(const LLSD& notification, const LLSD& response, LLFl
{
floater->resetAllIgnored();
LLFirstUse::resetFirstUse();
LLFloaterPreference::buildLists(floater);
floater->buildPopupLists();
}
}
return false;
@ -391,6 +391,7 @@ LLFloaterPreference::~LLFloaterPreference()
ctrl_window_size->setCurrentByIndex(i);
}
}
void LLFloaterPreference::draw()
{
BOOL has_first_selected = (getChildRef<LLScrollListCtrl>("disabled_popups").getFirstSelected()!=NULL);
@ -548,17 +549,17 @@ void LLFloaterPreference::cancel()
void LLFloaterPreference::onOpen(const LLSD& key)
{
gAgent.sendAgentUserInfoRequest();
/////////////////////////// From LLPanelGeneral //////////////////////////
// if we have no agent, we can't let them choose anything
// if we have an agent, then we only let them choose if they have a choice
bool canChoose = gAgent.getID().notNull() &&
(gAgent.isMature() || gAgent.isGodlike());
bool can_choose_maturity =
gAgent.getID().notNull() && (gAgent.isMature() || gAgent.isGodlike());
LLComboBox* maturity_combo = getChild<LLComboBox>("maturity_desired_combobox");
if (canChoose)
{
if (can_choose_maturity)
{
// if they're not adult or a god, they shouldn't see the adult selection, so delete it
if (!gAgent.isAdult() && !gAgent.isGodlike())
{
@ -568,8 +569,7 @@ void LLFloaterPreference::onOpen(const LLSD& key)
maturity_combo->remove(0);
}
childSetVisible("maturity_desired_combobox", true);
childSetVisible("maturity_desired_textbox", false);
childSetVisible("maturity_desired_textbox", false);
}
else
{
@ -577,6 +577,10 @@ void LLFloaterPreference::onOpen(const LLSD& key)
childSetVisible("maturity_desired_combobox", false);
}
// Enabled/disabled popups, might have been changed by user actions
// while preferences floater was closed.
buildPopupLists();
LLPanelLogin::setAlwaysRefresh(true);
refresh();
@ -717,14 +721,6 @@ void LLFloaterPreference::updateMeterText(LLUICtrl* ctrl)
m1->setVisible(two_digits);
m2->setVisible(!two_digits);
}
/*
void LLFloaterPreference::onClickClearCache()
{
// flag client cache for clearing next time the client runs
gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
LLNotificationsUtil::add("CacheWillClear");
}
*/
void LLFloaterPreference::onClickBrowserClearCache()
{
@ -794,12 +790,13 @@ void LLFloaterPreference::refreshSkin(void* data)
self->getChild<LLRadioGroup>("skin_selection", true)->setValue(sSkin);
}
// static
void LLFloaterPreference::buildLists(void* data)
void LLFloaterPreference::buildPopupLists()
{
LLPanel*self = (LLPanel*)data;
LLScrollListCtrl& disabled_popups = self->getChildRef<LLScrollListCtrl>("disabled_popups");
LLScrollListCtrl& enabled_popups = self->getChildRef<LLScrollListCtrl>("enabled_popups");
LLScrollListCtrl& disabled_popups =
getChildRef<LLScrollListCtrl>("disabled_popups");
LLScrollListCtrl& enabled_popups =
getChildRef<LLScrollListCtrl>("enabled_popups");
disabled_popups.deleteAllItems();
enabled_popups.deleteAllItems();
@ -861,8 +858,7 @@ void LLFloaterPreference::buildLists(void* data)
}
void LLFloaterPreference::refreshEnabledState()
{
{
LLCheckBoxCtrl* ctrl_reflections = getChild<LLCheckBoxCtrl>("Reflections");
LLRadioGroup* radio_reflection_detail = getChild<LLRadioGroup>("ReflectionDetailRadio");
@ -1111,7 +1107,7 @@ void LLFloaterPreference::onClickEnablePopup()
LLUI::sSettingGroups["ignores"]->setBOOL(notification_name, TRUE);
}
buildLists(this);
buildPopupLists();
}
void LLFloaterPreference::onClickDisablePopup()
@ -1128,8 +1124,9 @@ void LLFloaterPreference::onClickDisablePopup()
LLUI::sSettingGroups["ignores"]->setBOOL(notification_name, FALSE);
}
buildLists(this);
buildPopupLists();
}
void LLFloaterPreference::resetAllIgnored()
{
for (LLNotifications::TemplateMap::const_iterator iter = LLNotifications::instance().templatesBegin();
@ -1428,17 +1425,11 @@ BOOL LLPanelPreference::postBuild()
}
}
////////////////////////Panel Popups/////////////////
if(hasChild("disabled_popups") && hasChild("enabled_popups"))
{
LLFloaterPreference::buildLists(this);
}
//////
if(hasChild("online_visibility") && hasChild("send_im_to_email"))
{
childSetText("email_address",getString("log_in_to_change") );
// childSetText("busy_response", getString("log_in_to_change"));
// childSetText("busy_response", getString("log_in_to_change"));
}
@ -1573,8 +1564,7 @@ void LLPanelPreference::saveSettings()
{
view_stack.push_back(*iter);
}
}
}
}
void LLPanelPreference::cancel()
@ -1607,4 +1597,3 @@ void LLPanelPreference::setControlFalse(const LLSD& user_data)
if (control)
control->set(LLSD(FALSE));
}

4
indra/newview/llfloaterpreference.h
View File

@ -85,7 +85,6 @@ protected:
void onBtnCancel();
void onBtnApply();
// void onClickClearCache();
void onClickBrowserClearCache();
// if the custom settings box is clicked
@ -141,7 +140,7 @@ public:
static void initWindowSizeControls(LLPanel* panelp);
static void buildLists(void* data);
void buildPopupLists();
static void refreshSkin(void* data);
static void cleanupBadSetting();
static F32 sAspectRatio;
@ -153,7 +152,6 @@ private:
bool mOriginalHideOnlineStatus;
std::string mDirectoryVisibility;
};
class LLPanelPreference : public LLPanel

46
indra/newview/llnavigationbar.cpp
View File

@ -82,9 +82,24 @@ public:
struct Params : public LLInitParam::Block<Params, LLMenuItemCallGL::Params>
{
Mandatory<EType> item_type;
Params() {}
Mandatory<EType> item_type;
Optional<const LLFontGL*> back_item_font,
current_item_font,
forward_item_font;
Optional<std::string> back_item_image,
forward_item_image;
Optional<S32> image_hpad,
image_vpad;
Params()
: item_type(),
back_item_font("back_item_font"),
current_item_font("current_item_font"),
forward_item_font("forward_item_font"),
back_item_image("back_item_image"),
forward_item_image("forward_item_image"),
image_hpad("image_hpad"),
image_vpad("image_vpad")
{}
};
/*virtual*/ void draw();
@ -97,33 +112,38 @@ private:
static const S32 ICON_WIDTH = 16;
static const S32 ICON_HEIGHT = 16;
static const std::string ICON_IMG_BACKWARD;
static const std::string ICON_IMG_FORWARD;
LLIconCtrl* mArrowIcon;
};
const std::string LLTeleportHistoryMenuItem::ICON_IMG_BACKWARD("teleport_history_backward.tga");
const std::string LLTeleportHistoryMenuItem::ICON_IMG_FORWARD("teleport_history_forward.tga");
static LLDefaultChildRegistry::Register<LLTeleportHistoryMenuItem> r("teleport_history_menu_item");
LLTeleportHistoryMenuItem::LLTeleportHistoryMenuItem(const Params& p)
: LLMenuItemCallGL(p),
mArrowIcon(NULL)
{
// Set appearance depending on the item type.
if (p.item_type == TYPE_CURRENT)
if (p.item_type == TYPE_BACKWARD)
{
setFont(LLFontGL::getFontSansSerifBold());
setFont( p.back_item_font );
setLabel(std::string(" ") + std::string(p.label));
}
else if (p.item_type == TYPE_CURRENT)
{
setFont( p.current_item_font );
}
else
{
setFont(LLFontGL::getFontSansSerif());
setFont( p.forward_item_font );
setLabel(std::string(" ") + std::string(p.label));
}
LLIconCtrl::Params icon_params;
icon_params.name("icon");
icon_params.rect(LLRect(0, ICON_HEIGHT, ICON_WIDTH, 0));
LLRect rect(0, ICON_HEIGHT, ICON_WIDTH, 0);
rect.translate( p.image_hpad, p.image_vpad );
icon_params.rect( rect );
icon_params.mouse_opaque(false);
icon_params.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
icon_params.visible(false);
@ -132,9 +152,9 @@ LLTeleportHistoryMenuItem::LLTeleportHistoryMenuItem(const Params& p)
// no image for the current item
if (p.item_type == TYPE_BACKWARD)
mArrowIcon->setValue(ICON_IMG_BACKWARD);
mArrowIcon->setValue( p.back_item_image() );
else if (p.item_type == TYPE_FORWARD)
mArrowIcon->setValue(ICON_IMG_FORWARD);
mArrowIcon->setValue( p.forward_item_image() );
addChild(mArrowIcon);
}

13
indra/newview/llselectmgr.cpp
View File

@ -5753,19 +5753,8 @@ void LLSelectMgr::redo()
//-----------------------------------------------------------------------------
BOOL LLSelectMgr::canDoDelete() const
{
bool can_delete = false;
LLViewerObject* obj = const_cast<LLSelectMgr*>(this)->mSelectedObjects->getFirstDeleteableObject() ; // HACK: casting away constness - MG
// Note: Can only delete root objects (see getFirstDeleteableObject() for more info)
if (obj!= NULL)
{
// all the faces needs to be selected
if(const_cast<LLSelectMgr*>(this)->mSelectedObjects->contains(obj,SELECT_ALL_TES ))
{
can_delete = true;
}
}
return can_delete;
return const_cast<LLSelectMgr*>(this)->mSelectedObjects->getFirstDeleteableObject() != NULL; // HACK: casting away constness - MG
}
//-----------------------------------------------------------------------------

20
indra/newview/llviewermenu.cpp
View File

@ -2310,12 +2310,6 @@ class LLObjectEnableReportAbuse : public view_listener_t
bool handleEvent(const LLSD& userdata)
{
bool new_value = LLSelectMgr::getInstance()->getSelection()->getObjectCount() != 0;
/* // all the faces needs to be selected
if(LLSelectMgr::getInstance()->getSelection()->contains(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject(),SELECT_ALL_TES ))
{
new_value = true;
}
*/
return new_value;
}
};
@ -2704,7 +2698,6 @@ BOOL enable_has_attachments(void*)
bool enable_object_mute()
{
LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
bool new_value = (object != NULL);
if (new_value)
{
@ -2717,19 +2710,6 @@ bool enable_object_mute()
BOOL is_self = avatar->isSelf();
new_value = !is_linden && !is_self;
}
else
{
if( LLSelectMgr::getInstance()->getSelection()->contains(object,SELECT_ALL_TES ))
{
new_value = true;
}
else
{
new_value = false;
}
}
}
return new_value;
}

4
indra/newview/skins/default/xui/en/floater_animation_preview.xml
View File

@ -525,7 +525,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
We recommend BVH files exported from Poser 4.
</text>
<button
top="580"
top="580"
follows="bottom|left"
height="23"
label="Upload (L$[AMOUNT])"
@ -534,7 +534,7 @@ We recommend BVH files exported from Poser 4.
name="ok_btn"
width="128" />
<button
top="580"
top="580"
follows="bottom|left"
height="23"
label="Cancel"

2
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -1688,7 +1688,7 @@ This location can play streaming media.
Streaming media requires a fast Internet connection.
Play streaming media when available?
(You can change this option later under Preferences &gt; Audio &amp; Video.)
(You can change this option later under Preferences &gt; Privacy.)
<usetemplate
name="okcancelbuttons"
notext="Disable"

97
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
View File

@ -23,7 +23,7 @@
name="System Volume"
show_text="false"
slider_label.halign="right"
top_pad="5"
top="10"
volume="true"
width="350">
<slider.commit_callback
@ -230,12 +230,13 @@
width="22" />
<check_box
label_text.halign="left"
follows="right|top"
height="16"
control_name ="EnableVoiceChat"
disabled_control="CmdLineDisableVoice"
label="Voice"
left="50"
follows="left|top"
height="16"
control_name ="EnableVoiceChat"
disabled_control="CmdLineDisableVoice"
label="Enable voice"
layout="topleft"
left="28"
name="enable_voice_check"
top_pad="5"
width="110"
@ -249,15 +250,16 @@
height="15"
increment="0.05"
initial_value="0.5"
label_width="0"
label="Voice"
label_width="160"
layout="topleft"
left="165"
top_delta="0"
left="0"
top_delta="20"
name="Voice Volume"
show_text="false"
slider_label.halign="right"
volume="true"
width="185">
width="350">
<slider.commit_callback
function="Pref.setControlFalse"
parameter="MuteVoice" />
@ -283,63 +285,70 @@
follows="left|top"
height="13"
layout="topleft"
left="170"
left="30"
name="Listen from"
width="200">
width="200"
top="205">
Listen from:
</text>
<icon
follows="left"
follows="left|top"
height="18"
image_name="Cam_FreeCam_Off"
layout="topleft"
name="camera_icon"
mouse_opaque="false"
visible="true"
width="18" />
width="18"
left="80"
top="219"/>
<icon
follows="left"
follows="left|top"
height="18"
image_name="Move_Walk_Off"
layout="topleft"
name="avatar_icon"
mouse_opaque="false"
visible="true"
width="18" />
width="18"
top="239"
left="80"
/>
<radio_group
enabled_control="EnableVoiceChat"
control_name="VoiceEarLocation"
draw_border="false"
follows="left"
left_delta="20"
top = "210"
width="221"
height="38"
name="ear_location">
<radio_item
height="16"
label="Camera position"
left_pad="1"
follows="topleft"
name="0"
top_delta="-30"
width="200" />
<radio_item
height="16"
follows="topleft"
label="Avatar position"
left_delta="0"
name="1"
top_delta="19"
width="200" />
</radio_group>
follows="left|top"
layout="topleft"
left="100"
width="221"
height="38"
name="ear_location"
top="218">
<radio_item
height="16"
label="Camera position"
follows="left|top"
layout="topleft"
name="0"
width="200"/>
<radio_item
height="16"
follows="left|top"
label="Avatar position"
layout="topleft"
name="1"
width="200" />
</radio_group>
<button
control_name="ShowDeviceSettings"
follows="left|bottom"
follows="left|top"
height="19"
is_toggle="true"
label="Input/Output Devices"
label="Input/Output devices"
layout="topleft"
left="165"
top_pad="12"
left="30"
top="270"
name="device_settings_btn"
width="190">
</button>

64
indra/newview/skins/default/xui/en/role_actions.xml
View File

@ -4,39 +4,39 @@
description="These Abilities include powers to add and remove group Members, and allow new Members to join without an invitation."
name="Membership">
<action description="Invite People to this Group"
longdescription="Invite People to this Group using the &apos;Invite New Person...&apos; button in the Members &amp; Roles tab &gt; Members sub-tab."
longdescription="Invite People to this Group using the &apos;Invite&apos; button in the Roles section &gt; Members tab."
name="member invite" value="1" />
<action description="Eject Members from this Group"
longdescription="Eject Members from this Group using the &apos;Eject From Group&apos; button in the Members &amp; Roles tab &gt; Members sub-tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability."
longdescription="Eject Members from this Group using the &apos;Eject&apos; button in the Roles section &gt; Members tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability."
name="member eject" value="2" />
<action
description="Toggle &apos;Open Enrollment&apos; and change &apos;Signup Fee&apos;"
longdescription="Toggle &apos;Open Enrollment&apos; to let new Members join without an invitation, and change &apos;Signup Fee&apos; in the Group Preferences section of the General tab."
description="Toggle &apos;Open Enrollment&apos; and change &apos;Enrollment fee&apos;"
longdescription="Toggle &apos;Open Enrollment&apos; to let new Members join without an invitation, and change the &apos;Enrollment fee&apos; in the General section."
name="member options" value="3" />
</action_set>
<action_set
description="These Abilities include powers to add, remove, and change group Roles, add and remove Members in Roles, and assign Abilities to Roles."
name="Roles">
<action description="Create new Roles"
longdescription="Create new Roles in the Members &amp; Roles tab &gt; Roles sub-tab."
longdescription="Create new Roles in the Roles section &gt; Roles tab."
name="role create" value="4" />
<action description="Delete Roles"
longdescription="Delete Roles in the Members &amp; Roles tab &gt; Roles sub-tab."
longdescription="Delete Roles in the Roles section &gt; Roles tab."
name="role delete" value="5" />
<action description="Change Role names, titles, descriptions, and whether Role members are publicly visible"
longdescription="Change Role names, titles, descriptions, and whether Role members are publicly visible. This is done at the bottom of the the Members &amp; Roles tab &gt; Roles sub-tab after selecting a Role."
<action description="Change Role names, titles, descriptions, and whether Role members are publicly revealed"
longdescription="Change Role names, titles, descriptions, and whether Role members are publicly revealed. This is done at the bottom of the the Roles section &gt; Roles tab after selecting a Role."
name="role properties" value="6" />
<action description="Assign Members to Assigner&apos;s Roles"
longdescription="Assign Members to Roles in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. A Member with this Ability can only add Members to a Role the assigner is already in."
longdescription="Assign Members to Roles in the list of Assigned Roles (Roles section &gt; Members tab). A Member with this Ability can only add Members to a Role that the assigner is already in."
name="role assign member limited" value="7" />
<action description="Assign Members to Any Role"
longdescription="Assign Members to Any Role in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."
longdescription="Assign Members to Any Role in the list of Assigned Roles (Roles section &gt; Members tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."
name="role assign member" value="8" />
<action description="Remove Members from Roles"
longdescription="Remove Members from Roles in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. Owners can&apos;t be removed."
longdescription="Remove Members from Roles in the list of Assigned Roles (Roles section &gt; Members tab). Owners can&apos;t be removed."
name="role remove member" value="9" />
<action description="Assign and Remove Abilities in Roles"
longdescription="Assign and Remove Abilities in Roles in the Allowed Abilities section of the Members &amp; Roles tab &gt; Roles sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."
longdescription="Assign and Remove Abilities for each Role in the list of Allowed Abilities (Roles section &gt; Roles tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."
name="role change actions" value="10" />
</action_set>
<action_set
@ -44,11 +44,11 @@
name="Group Identity">
<action
description="Change Charter, Insignia, and &apos;Show in search&apos;"
longdescription="Change Charter, Insignia, and &apos;Show in search&apos;. This is done in the General tab."
longdescription="Change Charter, Insignia, and &apos;Show in search&apos;. This is done in the General section."
name="group change identity" value="11" />
</action_set>
<action_set
description="These Abilities include powers to deed, modify, and sell land in this group&apos;s land holdings. To get to the About Land window, right-click the ground and select &apos;About Land...&apos;, or click the parcel info in the menu bar."
description="These Abilities include powers to deed, modify, and sell land in this group&apos;s land holdings. To get to the About Land window, right-click the ground and select &apos;About Land&apos;, or click the &apos;i&apos; icon in the Navigation Bar."
name="Parcel Management">
<action description="Deed land and buy land for group"
longdescription="Deed land and buy land for group. This is done in About Land &gt; General tab."
@ -60,18 +60,18 @@
longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land &gt; General tab as they wish! Be sure you know what you&apos;re doing before assigning this Ability."
name="land set sale info" value="14" />
<action description="Subdivide and join parcels"
longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "
longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide&apos;. To join, select two or more contiguous parcels and click &apos;Join&apos;. "
name="land divide join" value="15" />
</action_set>
<action_set
description="These Abilities include powers to change the parcel name and publish settings, Find directory visibility, and landing point &amp; TP routing options."
name="Parcel Identity">
<action description="Toggle &apos;Show in Find Places&apos; and set category"
longdescription="Toggle &apos;Show in Find Places&apos; and setting a parcel&apos;s category in About Land &gt; Options tab."
<action description="Toggle &apos;Show Place in Search&apos; and set category"
longdescription="Toggle &apos;Show Place in Search&apos; and setting a parcel&apos;s category in About Land &gt; Options tab."
name="land find places" value="17" />
<action
description="Change parcel name, description, and &apos;Show in search&apos; settings"
longdescription="Change parcel name, description, and &apos;Show in search&apos; settings. This is done in About Land &gt; Options tab."
description="Change parcel name, description, and &apos;Show Place in Search&apos; settings"
longdescription="Change parcel name, description, and &apos;Show Place in Search&apos; settings. This is done in About Land &gt; Options tab."
name="land change identity" value="18" />
<action description="Set landing point and set teleport routing"
longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land &gt; Options tab."
@ -87,7 +87,7 @@
longdescription="Toggle &apos;Edit Terrain&apos;. *WARNING* About Land &gt; Options tab &gt; Edit Terrain allows anyone to terraform your land&apos;s shape, and place and move Linden plants. Be sure you know what you&apos;re doing before assigning this Ability. Editing terrain is toggled in About Land &gt; Options tab."
name="land edit" value="21" />
<action description="Toggle various About Land &gt; Options settings"
longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab."
longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Edit Terrain&apos;, &apos;Build&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab."
name="land options" value="22" />
</action_set>
<action_set
@ -106,7 +106,7 @@
longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
name="land allow landmark" value="26" />
<action description="Allow &apos;Set Home to Here&apos; on group land"
longdescription="Members in a Role with this Ability can use World menu &gt; Set Home to Here on a parcel deeded to this group."
longdescription="Members in a Role with this Ability can use World menu &gt; Landmarks &gt; Set Home to Here on a parcel deeded to this group."
name="land allow set home" value="28" />
</action_set>
<action_set
@ -116,13 +116,13 @@
longdescription="Manage parcel Access lists in About Land &gt; Access tab."
name="land manage allowed" value="29" />
<action description="Manage parcel Ban lists"
longdescription="Manage parcel Ban lists in About Land &gt; Ban tab."
longdescription="Manage parcel Ban lists in About Land &gt; Access tab."
name="land manage banned" value="30" />
<action description="Change parcel &apos;Sell passes...&apos; settings"
longdescription="Change parcel &apos;Sell passes...&apos; settings in About Land &gt; Access tab."
<action description="Change parcel &apos;Sell passes to&apos; settings"
longdescription="Change parcel &apos;Sell passes to&apos; settings in About Land &gt; Access tab."
name="land manage passes" value="31" />
<action description="Eject and freeze Residents on parcels"
longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, More &gt;, and selecting &apos;Eject...&apos; or &apos;Freeze...&apos;."
longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, then selecting &apos;Eject&apos; or &apos;Freeze&apos;."
name="land admin" value="32" />
</action_set>
<action_set
@ -138,20 +138,20 @@
longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab."
name="land return non group" value="34" />
<action description="Landscaping using Linden plants"
longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder or they can be created via the Build button."
longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder, or they can be created via the Build menu."
name="land gardening" value="35" />
</action_set>
<action_set
description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "
description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Build Tools &gt; General tab. Right-click an object and Edit to see its settings. "
name="Object Management">
<action description="Deed objects to group"
longdescription="Deed objects to group in the Edit Tools &gt; General Tab."
longdescription="Deed objects to group in the Build Tools &gt; General tab."
name="object deed" value="36" />
<action description="Manipulate (move, copy, modify) group-owned objects"
longdescription="Manipulate (move, copy, modify) group-owned objects in the Edit Tools &gt; General Tab."
longdescription="Manipulate (move, copy, modify) group-owned objects in the Build Tools &gt; General tab."
name="object manipulate" value="38" />
<action description="Set group-owned objects for sale"
longdescription="Set group-owned objects for sale in the Edit Tools &gt; General tab."
longdescription="Set group-owned objects for sale in the Build Tools &gt; General tab."
name="object set sale" value="39" />
</action_set>
<action_set
@ -165,10 +165,10 @@
description="These Abilities include powers to allow Members to send, receive, and view group Notices."
name="Notices">
<action description="Send Notices"
longdescription="Members in a Role with this Ability can send Notices in Group Information &gt; Notices tab."
longdescription="Members in a Role with this Ability can send Notices via the Group &gt; Notices section."
name="notices send" value="42" />
<action description="Receive Notices and view past Notices"
longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group Information &gt; Notices tab."
longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group &gt; Notices section."
name="notices receive" value="43" />
</action_set>
<action_set

12
indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- Menu items for the back button drop-down menu of locations.
Based on menu_item_call.xml -->
<teleport_history_menu_item
back_item_font="SansSerif"
current_item_font="SansSerifBold"
forward_item_font="SansSerif"
back_item_image="teleport_history_backward.tga"
forward_item_image="teleport_history_forward.tga"
image_hpad="1"
image_vpad="0"
/>