From ed116da1311b281bcd815d9d3f95c1aecf67207d Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 16:48:41 +0000 Subject: DEV-33767 VWR-13897: Deleting multiple open animations crashes the viewer We were closing preview floaters while we were in the middle of assembling the MoveInventoryItem message. But closing an anim preview floater issues a AgentAnimation message to stop any playing animation previews. On resuming the MoveInventoryItem assembly, message system is in a rightly confused state. Made preview window closing happen before we start assembling the MoveInventoryItem message. --- indra/newview/llinventorybridge.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index ec2be0e8e9..5b59f52fa5 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -293,12 +293,27 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArrayfindCategoryUUIDForType(LLFolderType::FT_TRASH); LLViewerInventoryItem* item = NULL; - LLViewerInventoryCategory* cat = NULL; std::vector move_ids; LLInventoryModel::update_map_t update; bool start_new_message = true; S32 count = batch.count(); S32 i; + + // first, hide any 'preview' floaters that correspond to the items + // being deleted. + for(i = 0; i < count; ++i) + { + bridge = (LLInvFVBridge*)(batch.get(i)); + if(!bridge || !bridge->isItemRemovable()) continue; + item = (LLViewerInventoryItem*)model->getItem(bridge->getUUID()); + if(item) + { + LLPreview::hide(item->getUUID()); + } + } + + // do the inventory move to trash + for(i = 0; i < count; ++i) { bridge = (LLInvFVBridge*)(batch.get(i)); @@ -308,7 +323,6 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArraygetParentUUID() == trash_id) continue; move_ids.push_back(item->getUUID()); - LLPreview::hide(item->getUUID()); --update[item->getParentUUID()]; ++update[trash_id]; if(start_new_message) @@ -340,11 +354,12 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArrayisItemRemovable()) continue; - cat = (LLViewerInventoryCategory*)model->getCategory(bridge->getUUID()); + LLViewerInventoryCategory* cat = (LLViewerInventoryCategory*)model->getCategory(bridge->getUUID()); if(cat) { if(cat->getParentUUID() == trash_id) continue; -- cgit v1.2.3 From 38036b841291a19f36bd7a5d341c60482bb0351b Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 17:30:23 +0000 Subject: CID-210 Checker: REVERSE_INULL Function: LLFloaterGodTools::processRegionInfo(LLMessageSystem *) File: /indra/newview/llfloatergodtools.cpp --- indra/newview/llfloatergodtools.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp index 5294f09e64..eb56f387cd 100644 --- a/indra/newview/llfloatergodtools.cpp +++ b/indra/newview/llfloatergodtools.cpp @@ -213,6 +213,9 @@ void LLFloaterGodTools::showPanel(const std::string& panel_name) // static void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg) { + llassert(msg); + if (!msg) return; + LLHost host = msg->getSender(); if (host != gAgent.getRegionHost()) { @@ -270,8 +273,7 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg) if ( gAgent.isGodlike() && LLFloaterReg::instanceVisible("god_tools") && god_tools->mPanelRegionTools - && god_tools->mPanelObjectTools - && msg ) + && god_tools->mPanelObjectTools) { LLPanelRegionTools* rtool = god_tools->mPanelRegionTools; god_tools->mCurrentHost = host; -- cgit v1.2.3 From a2c6c09c5370b4068c91864e808fa8f970139ada Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 17:32:55 +0000 Subject: CID-209 Checker: REVERSE_INULL Function: LLVoiceClient::startUserIMSession(const LLUUID &) File: /indra/newview/llvoiceclient.cpp --- indra/newview/llvoiceclient.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'indra') diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index f3bfc2e86c..3d153db733 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -5377,24 +5377,25 @@ LLVoiceClient::sessionState* LLVoiceClient::startUserIMSession(const LLUUID &uui // No session with user, need to start one. std::string uri = sipURIFromID(uuid); session = addSession(uri); + + llassert(session); + if (!session) return NULL; + session->mIsSpatial = false; session->mReconnect = false; session->mIsP2P = true; session->mCallerID = uuid; } - if(session) + if(session->mHandle.empty()) { - if(session->mHandle.empty()) - { - // Session isn't active -- start it up. - sessionCreateSendMessage(session, false, true); - } - else - { - // Session is already active -- start up text. - sessionTextConnectSendMessage(session); - } + // Session isn't active -- start it up. + sessionCreateSendMessage(session, false, true); + } + else + { + // Session is already active -- start up text. + sessionTextConnectSendMessage(session); } return session; -- cgit v1.2.3 From cf119b522f0a5f5b8b28bc56ea1611d342fd1283 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 17:34:06 +0000 Subject: CID-137 Checker: NULL_RETURNS Function: LLPanelMainInventory::onCustomAction(const LLSD &) File: /indra/newview/llpanelmaininventory.cpp --- indra/newview/llpanelmaininventory.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 1895993a8e..2d3401966b 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -1003,7 +1003,10 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata) } const LLUUID item_id = current_item->getListener()->getUUID(); LLViewerInventoryItem *item = gInventory.getItem(item_id); - item->regenerateLink(); + if (item) + { + item->regenerateLink(); + } active_panel->setSelection(item_id, TAKE_FOCUS_NO); } if (command_name == "find_original") -- cgit v1.2.3 From 5f08031bbdfe95caf657a975ba1b187004fd5619 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 17:35:24 +0000 Subject: CID-135 Checker: NULL_RETURNS Function: LLPreviewLSL::postBuild() File: /indra/newview/llpreviewscript.cpp --- indra/newview/llpreviewscript.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 3221745fa3..ae7b30b55c 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -956,7 +956,10 @@ BOOL LLPreviewLSL::postBuild() const LLInventoryItem* item = getItem(); childSetCommitCallback("desc", LLPreview::onText, this); - childSetText("desc", item->getDescription()); + if (item) + { + childSetText("desc", item->getDescription()); + } childSetPrevalidate("desc", &LLTextValidate::validateASCIIPrintableNoPipe); return LLPreview::postBuild(); -- cgit v1.2.3 From fecaf7b64fdc3d9ebf1d32ddb1ed8b50904db534 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 17:35:45 +0000 Subject: CID-135 followup --- indra/newview/llpreviewscript.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index ae7b30b55c..f5a9f82d50 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -955,11 +955,12 @@ BOOL LLPreviewLSL::postBuild() { const LLInventoryItem* item = getItem(); - childSetCommitCallback("desc", LLPreview::onText, this); + llassert(item); if (item) { childSetText("desc", item->getDescription()); } + childSetCommitCallback("desc", LLPreview::onText, this); childSetPrevalidate("desc", &LLTextValidate::validateASCIIPrintableNoPipe); return LLPreview::postBuild(); -- cgit v1.2.3 From 1ce4089fe75ad721f0992723defc64b18e1b7bd4 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 17:39:15 +0000 Subject: CID-133 Checker: NULL_RETURNS Function: is_agent_mappable(const LLUUID &) File: /indra/newview/llviewermenu.cpp --- indra/newview/llviewermenu.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 8c61ba7558..9565ae6150 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -3554,9 +3554,15 @@ bool LLHaveCallingcard::operator()(LLInventoryCategory* cat, BOOL is_agent_mappable(const LLUUID& agent_id) { - return (LLAvatarActions::isFriend(agent_id) && - LLAvatarTracker::instance().getBuddyInfo(agent_id)->isOnline() && - LLAvatarTracker::instance().getBuddyInfo(agent_id)->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION) + LLRelationship* buddy_info = NULL; + bool is_friend = LLAvatarActions::isFriend(agent_id); + + if (is_friend) + buddy_info = LLAvatarTracker::instance().getBuddyInfo(agent_id); + + return (buddy_info && + buddy_info->isOnline() && + buddy_info->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION) ); } -- cgit v1.2.3 From be03975a94523ad60daa9c591fce8f901ad56b98 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 17:43:02 +0000 Subject: CID-131 Checker: NULL_RETURNS Function: LLFloaterWorldMap::friendsChanged() File: /indra/newview/llfloaterworldmap.cpp actually the logic looks a bit suspicious (esp for isGodLike) but I've preserved it. --- indra/newview/llfloaterworldmap.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index f4d4ea3553..83db31423c 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -788,8 +788,11 @@ void LLFloaterWorldMap::friendsChanged() if(avatar_id.notNull()) { LLCtrlSelectionInterface *iface = childGetSelectionInterface("friend combo"); - if(!iface || !iface->setCurrentByID(avatar_id) || - !t.getBuddyInfo(avatar_id)->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION) || gAgent.isGodlike()) + LLRelationship* buddy_info = t.getBuddyInfo(avatar_id); + if(!iface || + !iface->setCurrentByID(avatar_id) || + (buddy_info && !buddy_info->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION)) || + gAgent.isGodlike()) { LLTracker::stopTracking(NULL); } -- cgit v1.2.3 From f763033db29a19bd58cbb2c595c9a76096888211 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 17:44:32 +0000 Subject: CID-87 Checker: FORWARD_NULL Function: LLLocationInputCtrl::refreshLocation() File: /indra/newview/lllocationinputctrl.cpp --- indra/newview/lllocationinputctrl.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'indra') diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index f48c96190f..c66d067779 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -833,10 +833,13 @@ void LLLocationInputCtrl::refreshParcelIcons() mDamageText->setVisible(false); } - S32 left_pad, right_pad; - mTextEntry->getTextPadding(&left_pad, &right_pad); - right_pad = mTextEntry->getRect().mRight - x; - mTextEntry->setTextPadding(left_pad, right_pad); + if (mTextEntry) + { + S32 left_pad, right_pad; + mTextEntry->getTextPadding(&left_pad, &right_pad); + right_pad = mTextEntry->getRect().mRight - x; + mTextEntry->setTextPadding(left_pad, right_pad); + } } void LLLocationInputCtrl::refreshHealth() -- cgit v1.2.3 From dda7e3f7a23beacbed249d5ae9b8169bdafaad44 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 17:47:06 +0000 Subject: some const'ness for previous fixes. --- indra/newview/llfloaterworldmap.cpp | 2 +- indra/newview/llviewermenu.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 83db31423c..b6de409611 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -788,7 +788,7 @@ void LLFloaterWorldMap::friendsChanged() if(avatar_id.notNull()) { LLCtrlSelectionInterface *iface = childGetSelectionInterface("friend combo"); - LLRelationship* buddy_info = t.getBuddyInfo(avatar_id); + const LLRelationship* buddy_info = t.getBuddyInfo(avatar_id); if(!iface || !iface->setCurrentByID(avatar_id) || (buddy_info && !buddy_info->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION)) || diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 9565ae6150..379cd5efb2 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -3554,7 +3554,7 @@ bool LLHaveCallingcard::operator()(LLInventoryCategory* cat, BOOL is_agent_mappable(const LLUUID& agent_id) { - LLRelationship* buddy_info = NULL; + const LLRelationship* buddy_info = NULL; bool is_friend = LLAvatarActions::isFriend(agent_id); if (is_friend) -- cgit v1.2.3 From 6810ea5c4a763558a6c344780047a5249c317d54 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 17:54:59 +0000 Subject: CID-40 Checker: DEADCODE Function: LLAvatarListItem::getItemChildView(LLAvatarListItem::e_avatar_item_child) File: /indra/newview/llavatarlistitem.cpp simply very redundant checking. removed the least-paranoid. --- indra/newview/llavatarlistitem.cpp | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'indra') diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp index 846b2843dd..5011b191f4 100644 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -526,21 +526,30 @@ void LLAvatarListItem::updateChildren() LLView* LLAvatarListItem::getItemChildView(EAvatarListItemChildIndex child_view_index) { LLView* child_view = mAvatarName; - if (child_view_index < 0 || ALIC_COUNT <= child_view_index) - { - LL_WARNS("AvatarItemReshape") << "Child view index is out of range: " << child_view_index << LL_ENDL; - return child_view; - } + switch (child_view_index) { - case ALIC_ICON: child_view = mAvatarIcon; break; - case ALIC_NAME: child_view = mAvatarName; break; - case ALIC_INTERACTION_TIME: child_view = mLastInteractionTime; break; - case ALIC_SPEAKER_INDICATOR: child_view = mSpeakingIndicator; break; - case ALIC_INFO_BUTTON: child_view = mInfoBtn; break; - case ALIC_PROFILE_BUTTON: child_view = mProfileBtn; break; + case ALIC_ICON: + child_view = mAvatarIcon; + break; + case ALIC_NAME: + child_view = mAvatarName; + break; + case ALIC_INTERACTION_TIME: + child_view = mLastInteractionTime; + break; + case ALIC_SPEAKER_INDICATOR: + child_view = mSpeakingIndicator; + break; + case ALIC_INFO_BUTTON: + child_view = mInfoBtn; + break; + case ALIC_PROFILE_BUTTON: + child_view = mProfileBtn; + break; default: LL_WARNS("AvatarItemReshape") << "Unexpected child view index is passed: " << child_view_index << LL_ENDL; + // leave child_view untouched } return child_view; -- cgit v1.2.3 From 4bb57fde32fbcf59eaf4de97aef547290fe34aec Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 17:56:33 +0000 Subject: CID-39 Checker: DEADCODE Function: LLToolPie::handleMediaClick(const LLPickInfo &) File: /indra/newview/lltoolpie.cpp simply some redundant checking, cleared-up for clarity --- indra/newview/lltoolpie.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index fdf9e1df2e..fb78b6a415 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1263,11 +1263,10 @@ bool LLToolPie::handleMediaClick(const LLPickInfo& pick) return false; LLMediaEntry* mep = (tep->hasMedia()) ? tep->getMediaData() : NULL; - if(!mep) return false; - viewer_media_t media_impl = mep ? LLViewerMedia::getMediaImplFromTextureID(mep->getMediaID()) : NULL; + viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(mep->getMediaID()); if (gSavedSettings.getBOOL("MediaOnAPrimUI")) { -- cgit v1.2.3 From dab54100f5df8036d86507ec66ad178194affb70 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 18:04:22 +0000 Subject: CID-37 Checker: DEADCODE Function: LLToolsSelectedScriptAction::handleEvent(const LLSD &) File: /indra/newview/llviewermenu.cpp --- indra/newview/llviewermenu.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 379cd5efb2..24a788aaed 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6408,7 +6408,6 @@ class LLToolsSelectedScriptAction : public view_listener_t else { llwarns << "Failed to generate LLFloaterScriptQueue with action: " << action << llendl; - delete queue; } return true; } -- cgit v1.2.3 From 398af7dd40a060cf9ad8d799df03d448c2f53a96 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 15 Feb 2010 18:06:49 +0000 Subject: CID-34 Checker: DEADCODE Function: LLDockableFloater::toggleInstance(const LLSD &) File: /indra/llui/lldockablefloater.cpp bool logic precendence assumptions were wrong. --- indra/llui/lldockablefloater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index a94f0206a6..0492ab0f25 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -95,7 +95,7 @@ void LLDockableFloater::toggleInstance(const LLSD& sdname) LLDockableFloater* instance = dynamic_cast (LLFloaterReg::findInstance(name)); // if floater closed or docked - if (instance == NULL || instance != NULL && instance->isDocked()) + if (instance == NULL || (instance && instance->isDocked())) { LLFloaterReg::toggleInstance(name, key); // restore button toggle state -- cgit v1.2.3 From d6027f543269610e72fc1ab1876e71a434b3461c Mon Sep 17 00:00:00 2001 From: Chuck Linden Date: Mon, 15 Feb 2010 18:17:32 -0500 Subject: Second round of polish on side-panels (People, groups, et al). https://jira.secondlife.com/browse/EXT-4335 --- .../skins/default/xui/en/panel_edit_classified.xml | 22 +-- .../skins/default/xui/en/panel_edit_pick.xml | 22 +-- .../skins/default/xui/en/panel_edit_profile.xml | 46 +++---- .../skins/default/xui/en/panel_group_general.xml | 8 +- .../default/xui/en/panel_group_info_sidetray.xml | 85 ++++++------ .../skins/default/xui/en/panel_group_roles.xml | 6 +- .../skins/default/xui/en/panel_landmarks.xml | 17 ++- indra/newview/skins/default/xui/en/panel_me.xml | 8 +- .../skins/default/xui/en/panel_my_profile.xml | 14 +- indra/newview/skins/default/xui/en/panel_notes.xml | 34 ++--- .../skins/default/xui/en/panel_notification.xml | 4 +- .../newview/skins/default/xui/en/panel_people.xml | 153 +++++++++++---------- .../skins/default/xui/en/panel_pick_info.xml | 10 +- indra/newview/skins/default/xui/en/panel_picks.xml | 10 +- .../newview/skins/default/xui/en/panel_profile.xml | 2 +- .../skins/default/xui/en/panel_profile_view.xml | 9 +- .../skins/default/xui/en/panel_side_tray.xml | 7 + 17 files changed, 237 insertions(+), 220 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index a357ba1d97..cc09835049 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -3,7 +3,7 @@ background_visible="true" bevel_style="in" follows="left|top|right|bottom" - height="570" + height="569" label="Edit Classified" layout="topleft" left="0" @@ -23,7 +23,7 @@ layout="topleft" name="back_btn" picture_style="true" - left="11" + left="12" tab_stop="false" top="2" width="23" /> @@ -46,12 +46,12 @@ follows="all" height="502" layout="topleft" - left="9" + left="8" top_pad="10" name="profile_scroll" reserve_scroll_corner="false" opaque="true" - width="310"> + width="312"> + top="10" + left="11" + width="286" /> @@ -252,6 +252,6 @@ layout="topleft" name="cancel_btn" left_pad="3" - width="152" /> + width="153" /> diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 6ef762dc1d..657e369beb 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -3,7 +3,7 @@ background_visible="true" bevel_style="in" follows="left|top|right|bottom" - height="570" + height="569" label="Edit Pick" layout="topleft" left="0" @@ -18,7 +18,7 @@ image_overlay="BackArrow_Off" layout="topleft" name="back_btn" - left="11" + left="12" tab_stop="false" top="2" width="23" /> @@ -41,11 +41,11 @@ follows="all" height="502" layout="topleft" - left="9" + left="8" top_pad="10" name="profile_scroll" opaque="true" - width="310"> + width="312"> + top="10" + left="11" + width="286" /> @@ -192,6 +192,6 @@ layout="topleft" name="cancel_btn" left_pad="3" - width="152" /> + width="153" /> diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index 2a2199fc87..26be8440e7 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -60,11 +60,11 @@ + width="292"> + width="292"> + width="292"> + width="282"> + width="102" /> + width="102" /> + width="272"> @@ -343,8 +343,8 @@ height="23" label="Cancel" layout="topleft" - left_pad="4" + left_pad="3" name="cancel_btn" - width="152" /> + width="153" /> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 662fd1ae73..41e53be29e 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -3,7 +3,7 @@ label="General" follows="all" height="604" - width="313" + width="303" class="panel_group_general" name="general_tab"> @@ -48,14 +48,14 @@ background_visible="true" layout="topleft" name="group_name" value="(Loading...)" - font="SansSerifHuge" - height="20" - left_pad="5" - text_color="white" - top="3" + font="SansSerifHugeBold" + height="26" + left_pad="10" + text_color="LtGray" + top="0" use_ellipses="true" - width="270" - follows="top|left" + width="275" + follows="top|left|right" word_wrap="true" mouse_opaque="false"/> @@ -167,56 +172,52 @@ background_visible="true" height="23" image_overlay="Refresh_Off" layout="topleft" - left="5" - top="0" + left="0" + top="5" name="btn_refresh" width="23" /> -