summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterprofile.cpp3
-rw-r--r--indra/newview/llpanelavatar.cpp2
-rw-r--r--indra/newview/llpanelprofile.cpp150
-rw-r--r--indra/newview/llpanelprofile.h31
-rw-r--r--indra/newview/skins/default/xui/en/floater_profile.xml27
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_profile.xml472
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile_secondlife.xml827
7 files changed, 338 insertions, 1174 deletions
diff --git a/indra/newview/llfloaterprofile.cpp b/indra/newview/llfloaterprofile.cpp
index f2863e1e27..0a775f217a 100644
--- a/indra/newview/llfloaterprofile.cpp
+++ b/indra/newview/llfloaterprofile.cpp
@@ -62,9 +62,6 @@ BOOL LLFloaterProfile::postBuild()
{
mPanelProfile = findChild<LLPanelProfile>(PANEL_PROFILE_VIEW);
- childSetAction("ok_btn", boost::bind(&LLFloaterProfile::onOKBtn, this));
- childSetAction("cancel_btn", boost::bind(&LLFloaterProfile::onCancelBtn, this));
-
return TRUE;
}
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index dbda6070fa..e25eba11d2 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -120,7 +120,7 @@ void LLPanelProfileTab::setApplyProgress(bool started)
if (indicator)
{
- indicator->setVisible(started);
+ indicator->setVisible(true);
if (started)
{
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index c19688191b..5453c87013 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -562,7 +562,6 @@ LLAgentHandler gAgentHandler;
LLPanelProfileSecondLife::LLPanelProfileSecondLife()
: LLPanelProfileTab()
- , mStatusText(NULL)
, mAvatarNameCacheConnection()
{
}
@@ -589,42 +588,13 @@ LLPanelProfileSecondLife::~LLPanelProfileSecondLife()
BOOL LLPanelProfileSecondLife::postBuild()
{
- mStatusText = getChild<LLTextBox>("status");
mGroupList = getChild<LLGroupList>("group_list");
mShowInSearchCheckbox = getChild<LLCheckBoxCtrl>("show_in_search_checkbox");
mSecondLifePic = getChild<LLIconCtrl>("2nd_life_pic");
mSecondLifePicLayout = getChild<LLPanel>("image_stack");
mDescriptionEdit = getChild<LLTextBase>("sl_description_edit");
- mTeleportButton = getChild<LLButton>("teleport");
- mShowOnMapButton = getChild<LLButton>("show_on_map_btn");
- mBlockButton = getChild<LLButton>("block");
- mUnblockButton = getChild<LLButton>("unblock");
- mNameLabel = getChild<LLUICtrl>("name_label");
- mDisplayNameButton = getChild<LLButton>("set_name");
- mAddFriendButton = getChild<LLButton>("add_friend");
- mGroupInviteButton = getChild<LLButton>("group_invite");
- mPayButton = getChild<LLButton>("pay");
- mIMButton = getChild<LLButton>("im");
- mCopyMenuButton = getChild<LLMenuButton>("copy_btn");
mGiveInvPanel = getChild<LLPanel>("give_stack");
- mStatusText->setVisible(FALSE);
- mCopyMenuButton->setVisible(FALSE);
-
- mAddFriendButton->setCommitCallback(boost::bind(&LLPanelProfileSecondLife::onAddFriendButtonClick, this));
- mIMButton->setCommitCallback(boost::bind(&LLPanelProfileSecondLife::onIMButtonClick, this));
- mTeleportButton->setCommitCallback(boost::bind(&LLPanelProfileSecondLife::onTeleportButtonClick, this));
- mShowOnMapButton->setCommitCallback(boost::bind(&LLPanelProfileSecondLife::onMapButtonClick, this));
- mPayButton->setCommitCallback(boost::bind(&LLPanelProfileSecondLife::pay, this));
- mBlockButton->setCommitCallback(boost::bind(&LLPanelProfileSecondLife::onClickToggleBlock, this));
- mUnblockButton->setCommitCallback(boost::bind(&LLPanelProfileSecondLife::onClickToggleBlock, this));
- mGroupInviteButton->setCommitCallback(boost::bind(&LLPanelProfileSecondLife::onGroupInvite,this));
- mDisplayNameButton->setCommitCallback(boost::bind(&LLPanelProfileSecondLife::onClickSetName, this));
- mSecondLifePic->setMouseUpCallback(boost::bind(&LLPanelProfileSecondLife::onPickTexture, this));
-
- LLUICtrl::CommitCallbackRegistry::ScopedRegistrar commit;
- commit.add("Profile.CopyName", [this](LLUICtrl*, const LLSD& userdata) { onCommitMenu(userdata); });
-
LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable;
enable.add("Profile.EnableCall", [this](LLUICtrl*, const LLSD&) { return mVoiceStatus; });
enable.add("Profile.EnableGod", [](LLUICtrl*, const LLSD&) { return gAgent.isGodlike(); });
@@ -632,8 +602,7 @@ BOOL LLPanelProfileSecondLife::postBuild()
mGroupList->setDoubleClickCallback(boost::bind(&LLPanelProfileSecondLife::openGroupProfile, this));
mGroupList->setReturnCallback(boost::bind(&LLPanelProfileSecondLife::openGroupProfile, this));
- LLVoiceClient::getInstance()->addObserver((LLVoiceClientStatusObserver*)this);
- mCopyMenuButton->setMenu("menu_name_field.xml", LLMenuButton::MP_BOTTOM_RIGHT);
+ //mAgentActionMenuButton->setMenu("menu_name_field.xml", LLMenuButton::MP_BOTTOM_RIGHT);
return TRUE;
}
@@ -649,16 +618,11 @@ void LLPanelProfileSecondLife::onOpen(const LLSD& key)
BOOL own_profile = getSelfProfile();
- mGroupInviteButton->setVisible(!own_profile);
- mShowOnMapButton->setVisible(!own_profile);
- mPayButton->setVisible(!own_profile);
- mTeleportButton->setVisible(!own_profile);
- mIMButton->setVisible(!own_profile);
- mAddFriendButton->setVisible(!own_profile);
- mBlockButton->setVisible(!own_profile);
- mUnblockButton->setVisible(!own_profile);
mGroupList->setShowNone(!own_profile);
- mGiveInvPanel->setVisible(!own_profile);
+ //mGiveInvPanel->setVisible(!own_profile);
+
+ childSetVisible("notes_panel", !own_profile);
+ childSetVisible("settings_panel", own_profile);
if (own_profile && !getEmbedded())
{
@@ -667,11 +631,8 @@ void LLPanelProfileSecondLife::onOpen(const LLSD& key)
mGroupList->enableForAgent(false);
}
- if (own_profile && !getEmbedded() )
+ if (own_profile)
{
- mNameLabel->setVisible(FALSE);
- mDisplayNameButton->setVisible(TRUE);
- mDisplayNameButton->setEnabled(TRUE);
}
mDescriptionEdit->setParseHTML(!own_profile && !getEmbedded());
@@ -794,11 +755,10 @@ void LLPanelProfileSecondLife::resetData()
mSecondLifePicLayout->reshape(imageRect.getHeight(), imageRect.getHeight());
mDescriptionEdit->setValue(LLStringUtil::null);
- mStatusText->setVisible(FALSE);
- mCopyMenuButton->setVisible(FALSE);
mGroups.clear();
mGroupList->setGroups(mGroups);
clearUploadProfileImagePath();
+ //mAgentActionMenuButton set menu
}
void LLPanelProfileSecondLife::processProfileProperties(const LLAvatarData* avatar_data)
@@ -858,8 +818,7 @@ void LLPanelProfileSecondLife::onAvatarNameCache(const LLUUID& agent_id, const L
{
mAvatarNameCacheConnection.disconnect();
- getChild<LLUICtrl>("complete_name")->setValue( av_name.getCompleteName() );
- mCopyMenuButton->setVisible(TRUE);
+ //getChild<LLUICtrl>("complete_name")->setValue( av_name.getCompleteName() );
}
void LLPanelProfileSecondLife::setUploadProfileImagePath(const std::string &path, const std::string &orig_path)
@@ -900,14 +859,8 @@ void LLPanelProfileSecondLife::fillCommonData(const LLAvatarData* avatar_data)
LLAvatarIconIDCache::getInstance()->add(avatar_data->avatar_id, avatar_data->image_id);
LLStringUtil::format_map_t args;
- {
- std::string birth_date = LLTrans::getString("AvatarBirthDateFormat");
- LLStringUtil::format(birth_date, LLSD().with("datetime", (S32) avatar_data->born_on.secondsSinceEpoch()));
- args["[REG_DATE]"] = birth_date;
- }
-
args["[AGE]"] = LLDateUtil::ageFromDate( avatar_data->born_on, LLDate::now());
- std::string register_date = getString("RegisterDateFormat", args);
+ std::string register_date = getString("AgeFormat", args);
getChild<LLUICtrl>("register_date")->setValue(register_date );
mDescriptionEdit->setValue(avatar_data->about_text);
mImageAssetId = avatar_data->image_id;
@@ -956,53 +909,7 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data
args["[PAYMENTINFO]"] = LLAvatarPropertiesProcessor::paymentInfo(avatar_data);
std::string caption_text = getString("CaptionTextAcctInfo", args);
- getChild<LLUICtrl>("acc_status_text")->setValue(caption_text);
-}
-
-void LLPanelProfileSecondLife::onMapButtonClick()
-{
- LLAvatarActions::showOnMap(getAvatarId());
-}
-
-void LLPanelProfileSecondLife::pay()
-{
- LLAvatarActions::pay(getAvatarId());
-}
-
-void LLPanelProfileSecondLife::onClickToggleBlock()
-{
- bool blocked = LLAvatarActions::toggleBlock(getAvatarId());
-
- updateButtons();
- // we are hiding one button and showing another, set focus
- if (blocked)
- {
- mUnblockButton->setFocus(true);
- }
- else
- {
- mBlockButton->setFocus(true);
- }
-}
-
-void LLPanelProfileSecondLife::onAddFriendButtonClick()
-{
- LLAvatarActions::requestFriendshipDialog(getAvatarId());
-}
-
-void LLPanelProfileSecondLife::onIMButtonClick()
-{
- LLAvatarActions::startIM(getAvatarId());
-}
-
-void LLPanelProfileSecondLife::onTeleportButtonClick()
-{
- LLAvatarActions::offerTeleport(getAvatarId());
-}
-
-void LLPanelProfileSecondLife::onGroupInvite()
-{
- LLAvatarActions::inviteToGroup(getAvatarId());
+ getChild<LLUICtrl>("account_info")->setValue(caption_text);
}
void LLPanelProfileSecondLife::onImageLoaded(BOOL success, LLViewerFetchedTexture *imagep)
@@ -1112,14 +1019,6 @@ void LLPanelProfileSecondLife::updateOnlineStatus()
void LLPanelProfileSecondLife::processOnlineStatus(bool online)
{
- mStatusText->setVisible(isGrantedToSeeOnlineStatus());
-
- std::string status = getString(online ? "status_online" : "status_offline");
-
- mStatusText->setValue(status);
- mStatusText->setColor(online ?
- LLUIColorTable::instance().getColor("StatusUserOnline") :
- LLUIColorTable::instance().getColor("StatusUserOffline"));
}
void LLPanelProfileSecondLife::updateButtons()
@@ -1132,33 +1031,6 @@ void LLPanelProfileSecondLife::updateButtons()
mShowInSearchCheckbox->setEnabled(TRUE);
mDescriptionEdit->setEnabled(TRUE);
}
-
- if (!getSelfProfile())
- {
- LLUUID av_id = getAvatarId();
- bool is_buddy_online = LLAvatarTracker::instance().isBuddyOnline(getAvatarId());
-
- if (LLAvatarActions::isFriend(av_id))
- {
- mTeleportButton->setEnabled(is_buddy_online);
- //Disable "Add Friend" button for friends.
- mAddFriendButton->setEnabled(false);
- }
- else
- {
- mTeleportButton->setEnabled(true);
- mAddFriendButton->setEnabled(true);
- }
-
- bool enable_map_btn = (is_buddy_online && is_agent_mappable(av_id)) || gAgent.isGodlike();
- mShowOnMapButton->setEnabled(enable_map_btn);
-
- bool enable_block_btn = LLAvatarActions::canBlock(av_id) && !LLAvatarActions::isBlocked(av_id);
- mBlockButton->setVisible(enable_block_btn);
-
- bool enable_unblock_btn = LLAvatarActions::isBlocked(av_id);
- mUnblockButton->setVisible(enable_unblock_btn);
- }
}
void LLPanelProfileSecondLife::onClickSetName()
@@ -1857,8 +1729,6 @@ void LLPanelProfile::onTabChange()
void LLPanelProfile::updateBtnsVisibility()
{
- getChild<LLUICtrl>("ok_btn")->setVisible(((getSelfProfile() && !getEmbedded()) || isNotesTabSelected()));
- getChild<LLUICtrl>("cancel_btn")->setVisible(((getSelfProfile() && !getEmbedded()) || isNotesTabSelected()));
}
void LLPanelProfile::onOpen(const LLSD& key)
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index 9aab8a087c..c73973b812 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -134,25 +134,6 @@ protected:
*/
virtual void fillAccountStatus(const LLAvatarData* avatar_data);
- void onMapButtonClick();
-
- /**
- * Opens "Pay Resident" dialog.
- */
- void pay();
-
- /**
- * Add/remove resident to/from your block list.
- * Updates button focus
- */
- void onClickToggleBlock();
-
- void onAddFriendButtonClick();
- void onIMButtonClick();
- void onTeleportButtonClick();
-
- void onGroupInvite();
-
void onImageLoaded(BOOL success, LLViewerFetchedTexture *imagep);
static void onImageLoaded(BOOL success,
LLViewerFetchedTexture *src_vi,
@@ -191,23 +172,11 @@ private:
group_map_t mGroups;
void openGroupProfile();
- LLTextBox* mStatusText;
LLGroupList* mGroupList;
LLCheckBoxCtrl* mShowInSearchCheckbox;
LLIconCtrl* mSecondLifePic;
LLPanel* mSecondLifePicLayout;
LLTextBase* mDescriptionEdit;
- LLButton* mTeleportButton;
- LLButton* mShowOnMapButton;
- LLButton* mBlockButton;
- LLButton* mUnblockButton;
- LLUICtrl* mNameLabel;
- LLButton* mDisplayNameButton;
- LLButton* mAddFriendButton;
- LLButton* mGroupInviteButton;
- LLButton* mPayButton;
- LLButton* mIMButton;
- LLMenuButton* mCopyMenuButton;
LLPanel* mGiveInvPanel;
bool mVoiceStatus;
diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml
index dede8bc0a6..92207cdc36 100644
--- a/indra/newview/skins/default/xui/en/floater_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile.xml
@@ -36,7 +36,7 @@
>
<panel
name="panel_profile_secondlife"
- label="Second Life"
+ label="BIO"
layout="topleft"
class="panel_profile_secondlife"
filename="panel_profile_secondlife.xml"
@@ -83,30 +83,5 @@
help_topic="profile_notes_tab"
/>
</tab_container>
- <button
- name="ok_btn"
- label="OK"
- tool_tip="Save changes to profile and close"
- bottom_delta="0"
- left="10"
- height="20"
- width="90"
- follows="left|bottom"
- layout="topleft"
- visible="false"
- />
- <button
- name="cancel_btn"
- label="Cancel"
- tool_tip="Discard unsaved changes and close"
- bottom_delta="0"
- right="-10"
- height="20"
- width="90"
- follows="right|bottom"
- layout="topleft"
- label_selected="Cancel"
- visible="false"
- />
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
deleted file mode 100644
index 3680759536..0000000000
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ /dev/null
@@ -1,472 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- class="edit_profile_panel"
- follows="all"
- height="585"
- label="Profile Edit"
- layout="topleft"
- left="0"
- name="edit_profile_panel"
- top="0"
- width="313">
- <string
- name="CaptionTextAcctInfo">
- [ACCTTYPE]
-[PAYMENTINFO] [AGEVERIFICATION]
- </string>
- <string
- name="RegisterDateFormat">
- [REG_DATE] ([AGE])
- </string>
- <string
- name="AcctTypeResident"
- value="Resident" />
- <string
- name="AcctTypeTrial"
- value="Trial" />
- <string
- name="AcctTypeCharterMember"
- value="Charter Member" />
- <string
- name="AcctTypeEmployee"
- value="Linden Lab Employee" />
- <string
- name="PaymentInfoUsed"
- value="Payment Info Used" />
- <string
- name="PaymentInfoOnFile"
- value="Payment Info On File" />
- <string
- name="NoPaymentInfoOnFile"
- value="No Payment Info On File" />
- <string
- name="AgeVerified"
- value="Age-verified" />
- <string
- name="NotAgeVerified"
- value="Not Age-verified" />
- <string
- name="partner_edit_link_url">
- http://www.secondlife.com/account/partners.php?lang=en
- </string>
- <string
- name="my_account_link_url">
- http://secondlife.com/my
- </string>
- <string
- name="no_partner_text"
- value="None" />
- <scroll_container
- color="DkGray2"
- follows="all"
- height="537"
- min_height="300"
- layout="topleft"
- left="8"
- width="292"
- name="profile_scroll"
- reserve_scroll_corner="true"
- opaque="true"
- top="10">
- <panel
- name="scroll_content_panel"
- follows="left|top|right"
- layout="topleft"
- top="0"
- height="537"
- min_height="300"
- left="0"
- width="292">
- <panel
- name="data_panel"
- follows="left|top|right"
- layout="topleft"
- top="0"
- height="537"
- min_height="300"
- left="0"
- width="292">
- <text
- top="5"
- follows="top|left"
- height="13"
- layout="topleft"
- left="10"
- name="display_name_label"
- text_color="LtGray"
- value="Display Name:"
- width="80" />
- <text
- top="5"
- follows="top|left"
- height="13"
- layout="topleft"
- left="10"
- name="solo_username_label"
- text_color="LtGray"
- value="Username:"
- visible="false"
- width="80" />
- <button
- name="set_name"
- layout="topleft"
- follows="top|left"
- image_overlay="Edit_Wrench"
- top="21"
- left="10"
- height="23"
- width="23"
- tool_tip="Set Display Name"/>
- <text
- follows="top|left"
- font="SansSerifBigBold"
- height="20"
- layout="topleft"
- left="10"
- name="solo_user_name"
- text_color="white"
- top_delta="3"
- translate="false"
- value="TestString PleaseIgnore"
- use_ellipses="true"
- visible="false"
- width="275" />
- <text
- follows="top|left"
- font="SansSerifBigBold"
- height="20"
- layout="topleft"
- left="43"
- name="user_name"
- text_color="white"
- top_delta="0"
- translate="false"
- value="TestString PleaseIgnore"
- use_ellipses="true"
- visible="true"
- width="250" />
- <text
- follows="top|left"
- font="SansSerifBold"
- height="20"
- layout="topleft"
- left_delta="0"
- name="user_name_small"
- text_color="white"
- top_delta="-4"
- translate="false"
- value="TestString PleaseIgnore"
- use_ellipses="true"
- visible="false"
- wrap="true"
- width="245" />
- <text
- follows="top|left"
- height="13"
- layout="topleft"
- left="10"
- name="user_label"
- text_color="LtGray"
- top_pad="8"
- value="Username:"
- width="70" />
- <text
- follows="top|left"
- height="20"
- layout="topleft"
- left_pad="0"
- name="user_slid"
- text_color="EmphasisColor"
- font="SansSerifBold"
- top_delta="-2"
- translate="false"
- use_ellipses="true"
- value="teststring.pleaseignore"
- wrap="true"
- width="205" />
- <panel
- name="lifes_images_panel"
- follows="left|top|right"
- height="244"
- layout="topleft"
- top="65"
- left="0"
- width="292">
- <panel
- follows="left|top"
- height="117"
- layout="topleft"
- left="10"
- name="second_life_image_panel"
- top="0"
- width="282">
- <text
- follows="left|top|right"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left="0"
- top="10"
- name="second_life_photo_title_text"
- text_color="white"
- value="[SECOND_LIFE]:"
- width="100" />
- <texture_picker
- allow_no_texture="true"
- default_image_name="None"
- enabled="false"
- fallback_image="default_profile_picture.j2c"
- follows="top|left"
- height="124"
- layout="topleft"
- left="1"
- name="2nd_life_pic"
- top_pad="0"
- width="102" />
- </panel>
- <icon
- height="102"
- image_name="spacer24.tga"
- layout="topleft"
- name="2nd_life_edit_icon"
- label=""
- left="11"
- top_pad="-92"
- tool_tip="Click to select an image"
- width="102" />
- </panel>
- <text_editor
- type="string"
- length="1"
- follows="left|top|right"
- font="SansSerifSmall"
- height="102"
- layout="topleft"
- left="123"
- top="90"
- max_length="65000"
- name="sl_description_edit"
- width="157"
- word_wrap="true">
- </text_editor>
- <panel
- follows="left|top"
- height="117"
- layout="topleft"
- top_pad="5"
- left="10"
- name="first_life_image_panel"
- width="285">
- <text
- follows="left|top|right"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left="0"
- top_pad="10"
- name="real_world_photo_title_text"
- text_color="white"
- value="Real World:"
- width="100" />
- <texture_picker
- allow_no_texture="true"
- default_image_name="None"
- enabled="false"
- fallback_image="Generic_Person_Large"
- follows="top|left"
- height="124"
- layout="topleft"
- left="1"
- name="real_world_pic"
- top_pad="0"
- width="102" />
- </panel>
- <icon
- height="102"
- image_name="spacer24.tga"
- layout="topleft"
- name="real_world_edit_icon"
- label=""
- left="11"
- top_pad="-92"
- tool_tip="Click to select an image"
- width="102" />
- <text_editor
- type="string"
- length="1"
- follows="left|top|right"
- font="SansSerifSmall"
- height="102"
- layout="topleft"
- left="123"
- max_length="65000"
- top="223"
- name="fl_description_edit"
- width="157"
- word_wrap="true">
- </text_editor>
- <text
- type="string"
- length="1"
- follows="left|top"
- font="SansSerifSmall"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left="10"
- name="title_homepage_text"
- text_color="white"
- top_pad="10"
- width="100">
- Homepage:
- </text>
- <line_editor
- follows="left|top|right"
- font="SansSerifSmall"
- height="20"
- layout="topleft"
- left="10"
- top_pad="0"
- value="http://"
- name="homepage_edit"
- width="272">
- </line_editor>
- <text
- follows="left|top"
- font="SansSerifSmall"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left="10"
- name="title_acc_status_text"
- text_color="white"
- top_pad="10"
- value="My Account:"
- width="100" />
- <text_editor
- allow_scroll="false"
- bg_visible="false"
- follows="left|top|right"
- h_pad="0"
- height="28"
- layout="topleft"
- left="10"
- name="acc_status_text"
- read_only="true"
- top_pad="5"
- v_pad="0"
- value="Resident. No payment info on file."
- width="200"
- word_wrap="true" />
- <text
- type="string"
- follows="left|top"
- font="SansSerifSmall"
- height="15"
- layout="topleft"
- left="10"
- name="my_account_link"
- value="[[URL] Go to My Dashboard]"
- width="200" />
- <text
- follows="left|top"
- font="SansSerifSmall"
- font.style="BOLD"
- height="15"
- layout="topleft"
- left="10"
- name="title_partner_text"
- text_color="white"
- top_pad="10"
- value="My Partner:"
- width="150" />
- <panel
- follows="left|top|right"
- height="15"
- layout="topleft"
- left="10"
- name="partner_data_panel"
- width="200">
- <text
- follows="left|top|right"
- height="12"
- initial_value="(retrieving)"
- layout="topleft"
- left="0"
- name="partner_text"
- top="0"
- use_ellipses="true"
- width="280"/>
- </panel>
- <text
- follows="left|top"
- height="15"
- layout="topleft"
- link="true"
- left="10"
- name="partner_edit_link"
- value="[[URL] Edit]"
- width="70" />
- </panel>
- </panel>
- </scroll_container>
- <panel
- follows="bottom|left|right"
- height="28"
- left="0"
- name="profile_me_buttons_panel"
- top_pad="0"
- width="313">
-
- <layout_stack
- follows="bottom|left|right"
- height="28"
- layout="topleft"
- name="bottom_panel_ls"
- left="7"
- orientation="horizontal"
- top_pad="0"
- width="295">
-
- <layout_panel
- follows="bottom|left|right"
- height="23"
- layout="bottomleft"
- name="save_changes_btn_lp"
- top="0"
- auto_resize="true"
- width="153">
- <button
- follows="bottom|left|right"
- height="23"
- label="Save Changes"
- layout="topleft"
- left="1"
- name="save_btn"
- top="0"
- width="152" />
- </layout_panel>
-
- <layout_panel
- follows="bottom|left|right"
- height="23"
- layout="bottomleft"
- left_pad="3"
- name="show_on_map_btn_lp"
- top="0"
- auto_resize="true"
- width="154">
- <button
- follows="bottom|left|right"
- height="23"
- label="Cancel"
- layout="topleft"
- left="1"
- name="cancel_btn"
- top="0"
- width="153" />
- </layout_panel>
- </layout_stack>
- </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index d8d2749a2b..fe1244aaf3 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -9,549 +9,374 @@
follows="all"
layout="topleft"
>
- <string
- name="status_online"
- >
- Currently Online
- </string>
- <string
- name="status_offline"
- >
- Currently Offline
- </string>
- <string
- name="CaptionTextAcctInfo"
- >
- [ACCTTYPE]
+ <string
+ name="AgeFormat"
+ value="[AGE]" />
+ <string
+ name="no_partner_text"
+ value="None" />
+ <string
+ name="CaptionTextAcctInfo">
+Account: [ACCTTYPE]
[PAYMENTINFO]
</string>
- <string
- name="payment_update_link_url"
- >
- http://www.secondlife.com/account/billing.php?lang=en
- </string>
- <string
- name="partner_edit_link_url"
- >
- http://www.secondlife.com/account/partners.php?lang=en
- </string>
- <string
- name="my_account_link_url"
- value="http://secondlife.com/account"
- />
- <string
- name="no_partner_text"
- value="None"
- />
- <string
- name="no_group_text"
- value="None"
- />
- <string
- name="RegisterDateFormat"
- >
- [REG_DATE]
- </string>
- <string
- name="name_text_args"
- >
- [NAME]
- </string>
- <string
- name="display_name_text_args"
- >
- [DISPLAY_NAME]
- </string>
- <string
- name="FSDev"
- value=" Developer"
- />
- <string
- name="FSSupp"
- value=" Support"
- />
- <string
- name="FSQualityAssurance"
- value=" Bug Hunter"
- />
- <string
- name="FSGW"
- value=" Gateway"
- />
- <loading_indicator
- name="progress_indicator"
- top="4"
- right="-10"
- height="23"
- width="23"
- follows="top|right"
- layout="topleft"
- visible="false"
- />
- <text
- name="name_label"
- value="Name:"
- top="8"
- left="6"
- height="20"
- width="55"
- follows="left|top"
- layout="topleft"
- halign="right"
- />
- <button
- name="set_name"
- label="Name:"
- tool_tip="Set Display Name"
- enabled="false"
- top_delta="0"
- left_delta="0"
- height="20"
- width="55"
- follows="top|left"
- layout="topleft"
- visible="false"
- />
- <panel
- name="name_holder"
- top_delta="0"
- left_pad="4"
- right="-5"
- height="20"
- follows="left|top|right"
+
+ <layout_stack
+ name="main_stack"
+ top="8"
+ left="6"
+ right="-1"
+ bottom="-1"
+ follows="all"
+ layout="topleft"
+ orientation="vertical">
+
+ <layout_panel
+ name="name_details_image"
+ follows="all"
layout="topleft"
- allow_scroll="false"
- bg_visible="false"
- border_visible="false">
- <text_editor
- name="complete_name"
- value="(loading...)"
- enabled="false"
+ height="160"
+ auto_resize="false"
+ user_resize="false">
+
+ <layout_stack
+ name="name_details_image_stack"
top="0"
left="0"
right="-1"
- height="20"
- follows="left|top|right"
+ bottom="-1"
+ follows="all"
layout="topleft"
- allow_scroll="false"
- bg_visible="false"
- border_visible="true"
- h_pad="1"
- v_pad="4"
- max_length="254"
- />
- <!--mouse_opaque="true"-->
- <menu_button
- name="copy_btn"
- tool_tip="Copy options"
- height="16"
- right="-2"
- top="2"
- width="16"
- image_selected="Copy"
- image_unselected="Copy"
- image_hover_selected="CopyBright"
- image_hover_unselected="CopyBright"
- hover_glow_amount="0.33"
- chrome="true"
- tab_stop="false"
- follows="top|right"
- layout="topleft" />
- </panel>
- <layout_stack
- name="imagepositioner"
- top_pad="6"
- left_delta="0"
- right="-1"
- height="158"
- follows="top|left|right"
- layout="topleft"
- orientation="horizontal"
- >
+ orientation="horizontal">
+
<layout_panel
- name="image_stack"
+ name="image_panel"
follows="all"
layout="topleft"
- width="158"
- height="158"
+ width="160"
auto_resize="false"
- user_resize="false"
- >
+ user_resize="false">
- <icon
- name="2nd_life_pic"
- image_name="Generic_Person_Large"
- layout="topleft"
- follows="all"
- top="0"
- left="0"
- width="157"
- height="157"/>
+ <icon
+ name="2nd_life_pic"
+ image_name="Generic_Person_Large"
+ layout="topleft"
+ follows="all"
+ top="0"
+ left="2"
+ bottom="-1"
+ right="-1"/>
+
</layout_panel>
<layout_panel
- name="label_stack"
+ name="details_panel"
follows="all"
layout="topleft"
auto_resize="true"
user_resize="false"
>
- <text
- name="status"
- value="Status Unknown"
- top="1"
- left="4"
- right="-6"
- height="16"
- follows="top|left"
- layout="topleft"
- halign="center"
- text_color="LtGray_50"
- />
- <text
- name="label"
- value="Second Life Birthdate:"
- top_pad="2"
- right="-6"
- height="16"
- follows="top|left"
- layout="topleft"
- />
- <text_editor
- name="register_date"
- value="(loading...)"
- top_pad="0"
- left_delta="2"
- right="-6"
- height="16"
- follows="top|left|right"
- layout="topleft"
- allow_scroll="false"
- bg_visible="false"
- border_visible="true"
- h_pad="2"
- max_length="254"
- read_only="true"
- translate="false"
- v_pad="2"
- word_wrap="true"
- />
- <text
- name="label2"
- value="Account:"
- top_pad="5"
- left_delta="-2"
- right="-6"
- height="16"
- follows="top|left"
- layout="topleft"
- />
- <text_editor
- name="acc_status_text"
- top_pad="0"
- left_delta="2"
- right="-6"
- height="44"
- follows="top|left|right"
- layout="topleft"
- allow_scroll="false"
- bg_visible="false"
- border_visible="true"
- h_pad="2"
- read_only="true"
- translate="false"
- v_pad="2"
- word_wrap="true"
- />
- <text
- name="partner_label"
- value="Partner:"
- top_pad="5"
- left_delta="-2"
- right="-6"
- height="16"
- follows="top|left"
- layout="topleft"
- />
- <text_editor
- name="partner_text"
- top_pad="0"
- left_delta="0"
- right="-6"
- height="20"
- follows="top|left|right"
- layout="topleft"
- allow_scroll="false"
- bg_visible="false"
- border_visible="true"
- parse_urls="true"
- h_pad="1"
- read_only="true"
- translate="false"
- v_pad="4"
- max_length="254"
- />
+ <text
+ name="display_name"
+ value="(loading...)"
+ top="0"
+ left="2"
+ right="-1"
+ height="20"
+ follows="left|top|right"
+ layout="topleft"/>
+
+ <text
+ name="user_name"
+ value="(loading...)"
+ top_pad="3"
+ left="2"
+ right="-1"
+ height="20"
+ follows="left|top|right"
+ layout="topleft"/>
+
+ <text
+ name="user_age"
+ value="(loading...)"
+ top_pad="3"
+ left="2"
+ right="-1"
+ height="20"
+ follows="left|top|right"
+ layout="topleft"/>
+
+ <text
+ name="partner_link"
+ value="Partner: (loading...)"
+ top_pad="3"
+ left="2"
+ right="-1"
+ height="20"
+ follows="left|top|right"
+ layout="topleft"/>
+
+ <text
+ name="account_info"
+ value="Account: (loading...)"
+ top_pad="3"
+ left="2"
+ right="-1"
+ height="20"
+ follows="left|top|right"
+ layout="topleft"/>
+
+ <menu_button
+ layout="topleft"
+ follows="left|bottom"
+ left="2"
+ bottom="-1"
+ height="25"
+ width="120"
+ label="Actions"
+ halign="left"
+ image_unselected="DropDown_Off"
+ image_selected="DropDown_On"
+ image_pressed="DropDown_Press"
+ image_pressed_selected="DropDown_Press"
+ image_disabled="DropDown_Disabled"
+ name="agent_actions" />
</layout_panel>
- </layout_stack>
- <text
- name="Groups:"
- value="Groups:"
- top_pad="7"
- left="6"
- height="16"
- width="55"
- follows="left|top"
- layout="topleft"
- halign="right"
- />
- <button
- name="group_invite"
- label="+"
- tool_tip="Invite to Group"
- top_delta="20"
- left="40"
- height="20"
- width="20"
- follows="left|top"
- layout="topleft"
- label_selected="+"
- />
- <group_list
- name="group_list"
- top_delta="-20"
- left="66"
- right="-7"
- height="82"
- follows="left|top|right"
- layout="topleft"
- border_visible="true"
- color="ScrollBgWriteableColor"
- for_agent="false"
- />
+
+ <layout_panel
+ name="permissions_panel"
+ follows="all"
+ layout="topleft"
+ width="26"
+ auto_resize="false"
+ user_resize="false">
+ <!--Probably should be borderless buttons-->
+ <icon
+ name="allow_to_see_online"
+ image_name="Generic_Person_Large"
+ layout="topleft"
+ follows="left|top"
+ top="0"
+ left="0"
+ width="24"
+ height="24"/>
+ <icon
+ name="allow_to_see_on_map"
+ image_name="Generic_Person_Large"
+ layout="topleft"
+ follows="left|top"
+ top_pad="7"
+ left="0"
+ width="24"
+ height="24"/>
+ <icon
+ name="allow_edit_my_objects"
+ image_name="Generic_Person_Large"
+ layout="topleft"
+ follows="left|top"
+ top_pad="7"
+ left="0"
+ width="24"
+ height="24"/>
+
+ </layout_panel>
+ </layout_stack>
+
+ </layout_panel>
- <layout_stack
- name="aboutpositioner"
- top_pad="7"
- left="6"
- right="-6"
- height="130"
+ <layout_panel
+ name="about_panel"
follows="all"
layout="topleft"
- orientation="vertical"
- >
- <layout_panel
- name="about_stack"
+ height="159"
+ auto_resize="true"
+ user_resize="false">
+ <text_editor
+ name="sl_description_edit"
+ trusted_content="false"
+ always_show_icons="true"
+ enabled="false"
+ top="1"
+ left="1"
+ right="-1"
+ bottom="-1"
follows="all"
layout="topleft"
- left="0"
- height="105"
- auto_resize="true"
- user_resize="false">
- <text
- name="About:"
- value="About:"
+ bg_readonly_color="Transparent"
+ border_visible="true"
+ font="SansSerifSmall"
+ h_pad="2"
+ max_length="65000"
+ parse_urls="true"
+ word_wrap="true"
+ />
+ </layout_panel>
+ <layout_panel
+ name="about_buttons_panel"
+ follows="all"
+ layout="topleft"
+ height="34"
+ auto_resize="false"
+ user_resize="false">
+ <button
+ name="save_description_changes"
+ label="Save"
top="1"
- left="0"
- height="16"
- width="55"
- follows="left|top"
+ right="-105"
+ height="20"
+ width="80"
+ follows="top|right"
layout="topleft"
- halign="right"
- />
- <text_editor
- name="sl_description_edit"
- trusted_content="false"
- always_show_icons="true"
- enabled="false"
- top="0"
- left="60"
+ label_selected="Find on Map"/>
+ <button
+ name="discard_description_changes"
+ label="Discard"
+ top="1"
right="-1"
- bottom="-1"
- follows="all"
- layout="topleft"
- bg_readonly_color="Transparent"
- border_visible="true"
- font="SansSerifSmall"
- h_pad="2"
- max_length="65000"
- parse_urls="true"
- word_wrap="true"
- />
- </layout_panel>
- <layout_panel
- name="give_stack"
- follows="left|bottom"
- layout="topleft"
- left="0"
- height="24"
- auto_resize="false"
- user_resize="false">
- <text
- name="Give item:"
- value="Give item:"
- top="6"
- left="0"
- height="16"
- width="55"
- follows="left|bottom"
+ height="20"
+ width="100"
+ follows="top|right"
layout="topleft"
- halign="right"
- />
+ label_selected="Find on Map"/>
<view_border
- name="drop_target_rect_vis"
- top_delta="0"
- left="60"
- right="-1"
- height="16"
- follows="left|bottom|right"
- layout="topleft"
- bevel_style="in"
- />
- <text
- name="Give inventory"
- tool_tip="Drop inventory items here to give them to this person."
- top_delta="0"
- left="60"
- right="-1"
- height="16"
- follows="left|bottom|right"
+ bevel_style="none"
+ height="0"
layout="topleft"
- halign="center"
- >
- Drop inventory item here.
- </text>
- </layout_panel>
- </layout_stack>
- <layout_stack
- name="buttonstack"
- bottom="-3"
- left="6"
- right="-6"
- height="44"
- follows="left|bottom|right"
+ left="0"
+ name="cost_text_border"
+ top_pad="9"
+ width="492"/>
+ </layout_panel>
+ <layout_panel
+ name="groups_notes_settings"
+ follows="all"
layout="topleft"
- orientation="horizontal"
- >
+ height="159"
+ auto_resize="true"
+ user_resize="false">
+
+ <layout_stack
+ name="groups_notes_settings_stack"
+ top="1"
+ left="1"
+ right="-1"
+ bottom="-1"
+ follows="all"
+ layout="topleft"
+ orientation="horizontal">
<layout_panel
- name="left_buttonstack"
- left="2"
- right="-2"
- height="42"
+ name="groups_panel"
follows="all"
layout="topleft"
- user_resize="false"
- >
- <button
- name="show_on_map_btn"
- label="Find on Map"
- tool_tip="Locate the Resident on the map"
- top="2"
- left="2"
- height="20"
- follows="left|top|right"
- layout="topleft"
- label_selected="Find on Map"
- />
- <button
- name="pay"
- label="Pay"
- tool_tip="Pay money to the Resident"
- top_pad="2"
- height="20"
- follows="left|top|right"
- layout="topleft"
- label_selected="Pay"
- />
+ width="200"
+ auto_resize="true"
+ user_resize="false">
+ <text
+ name="group_label"
+ value="(loading...) is a member of:"
+ top="1"
+ left="1"
+ right="-1"
+ height="16"
+ follows="left|top|right"
+ layout="topleft"/>
+ <group_list
+ name="group_list"
+ top_pad="1"
+ left="1"
+ right="-1"
+ bottom="-1"
+ follows="all"
+ layout="topleft"
+ border_visible="true"
+ color="ScrollBgWriteableColor"
+ for_agent="false"/>
+
</layout_panel>
+
<layout_panel
- name="middle_buttonstack"
- left="2"
- right="-2"
+ name="notes_panel"
follows="all"
layout="topleft"
- user_resize="false"
- >
- <button
- name="teleport"
- label="Offer Teleport"
- tool_tip="Offer a teleport to the Resident"
- top="2"
- left="2"
- height="20"
- follows="left|top|right"
- layout="topleft"
- label_selected="Offer Teleport"
- />
- <button
- name="im"
- label="Instant Message"
- tool_tip="Open instant message session"
- top_pad="2"
- height="20"
- follows="left|top|right"
- layout="topleft"
- label_selected="Instant Message"
- />
+ width="200"
+ auto_resize="true"
+ user_resize="false">
+ <!-- notes are only for other agents -->
+
+ <text
+ name="notes_label"
+ value="My private notes:"
+ top="1"
+ left="1"
+ right="-1"
+ height="16"
+ follows="left|top|right"
+ layout="topleft"/>
+ <text_editor
+ name="notes_edit"
+ trusted_content="false"
+ always_show_icons="true"
+ enabled="false"
+ top_pad="1"
+ left="1"
+ right="-1"
+ bottom="-27"
+ follows="all"
+ layout="topleft"
+ bg_readonly_color="Transparent"
+ border_visible="true"
+ font="SansSerifSmall"
+ h_pad="2"
+ max_length="65000"
+ parse_urls="true"
+ word_wrap="true"/>
+ <button
+ name="save_notes_changes"
+ label="Save"
+ bottom="-1"
+ right="-105"
+ height="20"
+ width="80"
+ follows="bottom|right"
+ layout="topleft"
+ label_selected="Find on Map"/>
+ <button
+ name="discard_notes_changes"
+ label="Discard"
+ bottom="-1"
+ right="-1"
+ height="20"
+ width="100"
+ follows="bottom|right"
+ layout="topleft"
+ label_selected="Find on Map"/>
</layout_panel>
+
<layout_panel
- name="right_buttonstack"
- left="2"
- right="-2"
+ name="settings_panel"
follows="all"
layout="topleft"
- user_resize="false"
- >
- <button
- name="add_friend"
- label="Add Friend"
- tool_tip="Offer friendship to the Resident"
- top="2"
- left="2"
- height="20"
- follows="left|top|right"
- layout="topleft"
- label_selected="Add Friend"
- />
- <button
- name="block"
- label="Block"
- tool_tip="Block this Resident"
- top_pad="2"
- height="20"
- follows="left|top|right"
- layout="topleft"
- />
- <button
- name="unblock"
- label="Unblock"
- tool_tip="Unblock this Resident"
- top_delta="0"
- height="20"
- follows="left|top|right"
- layout="topleft"
- />
+ width="200"
+ auto_resize="true"
+ user_resize="false">
+ <!-- settings will be here -->
+ <check_box
+ name="show_in_search_checkbox"
+ label="Show in search"
+ tool_tip="Let people see you in search results"
+ left="1"
+ top="1"
+ height="16"
+ width="130"
+ follows="left|top"
+ layout="topleft"
+ visible="true"
+ enabled="false"/>
</layout_panel>
- </layout_stack>
- <check_box
- name="show_in_search_checkbox"
- label="Show in search"
- tool_tip="Let people see you in search results"
- enabled="false"
- bottom="-30"
- left="60"
- height="16"
- width="130"
- follows="left|bottom"
- layout="topleft"
- visible="false"
- />
- <profile_drop_target
- name="drop_target"
- top="0"
- bottom="-1"
- left="0"
- right="-1"
- follows="all"
- layout="topleft"
- mouse_opaque="false"
- />
+
+
+ </layout_stack>
+
+ </layout_panel>
+ </layout_stack>
+
</panel>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 01:02:18 +0000