From bbe2daad55777974f10f98b8a8023c7e25fbd6d2 Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Tue, 2 Mar 2010 11:34:14 +0200 Subject: Fixed normal bug EXT-5856 - "Auto renew each week" checkbox is displayed in the Classified Info from other resident profile. Hide auro_renew checkbox for avatar classifieds and showing for agent classifirds. --HG-- branch : product-engine --- indra/newview/llpanelclassified.cpp | 2 ++ .../skins/default/xui/en/panel_classified_info.xml | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index b4c13da91e..f891a9fba2 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -1292,11 +1292,13 @@ void LLPanelClassifiedInfo::resetControls() { childSetEnabled("edit_btn", TRUE); childSetVisible("edit_btn", TRUE); + childSetVisible("auto_renew", TRUE); } else { childSetEnabled("edit_btn", FALSE); childSetVisible("edit_btn", FALSE); + childSetVisible("auto_renew", FALSE); } } diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index 34c1923582..903a9689f1 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -136,16 +136,6 @@ top_pad="5" v_pad="0" value="[category]" /> - + Date: Tue, 2 Mar 2010 09:47:25 +0000 Subject: CID-440 Checker: UNINIT_CTOR Function: LLPanelClassifiedInfo::LLPanelClassifiedInfo() File: /indra/newview/llpanelclassified.cpp --- indra/newview/llpanelclassified.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra') diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index b4c13da91e..3e374acdb3 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -1155,6 +1155,8 @@ LLPanelClassifiedInfo::LLPanelClassifiedInfo() , mInfoLoaded(false) , mScrollingPanel(NULL) , mScrollContainer(NULL) + , mScrollingPanelMinHeight(0) + , mScrollingPanelWidth(0) { } -- cgit v1.2.3 From ac7539bd68b771a934cfdff79af2dfba336fca8d Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 2 Mar 2010 09:50:09 +0000 Subject: CID-437 Checker: REVERSE_INULL Function: RecoveredItemLinkCB::fire(const LLUUID &) File: /indra/newview/llappearancemgr.cpp --- indra/newview/llappearancemgr.cpp | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'indra') diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 71df064236..03782510f2 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -528,22 +528,29 @@ public: LLViewerInventoryItem *item = gInventory.getItem(item_id); LLViewerInventoryItem *linked_item = item ? item->getLinkedItem() : NULL; - gInventory.addChangedMask(LLInventoryObserver::LABEL, linked_item->getUUID()); - - if (item && linked_item) + if (linked_item) { - LLFoundData found(linked_item->getUUID(), - linked_item->getAssetUUID(), - linked_item->getName(), - linked_item->getType(), - linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID - ); - found.mWearable = mWearable; - mHolder->mFoundList.push_front(found); + gInventory.addChangedMask(LLInventoryObserver::LABEL, linked_item->getUUID()); + + if (item) + { + LLFoundData found(linked_item->getUUID(), + linked_item->getAssetUUID(), + linked_item->getName(), + linked_item->getType(), + linked_item->isWearableType() ? linked_item->getWearableType() : WT_INVALID + ); + found.mWearable = mWearable; + mHolder->mFoundList.push_front(found); + } + else + { + llwarns << "inventory item not found for recovered wearable" << llendl; + } } else { - llwarns << "inventory item or link not found for recovered wearable" << llendl; + llwarns << "inventory link not found for recovered wearable" << llendl; } } private: -- cgit v1.2.3 From e88b6d9c7a5c17b88fb3e9efc95b540e6cefc12d Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Tue, 2 Mar 2010 11:53:00 +0200 Subject: =?UTF-8?q?fixed=20EXT-5693=20=E2=80=9CllDialog=20window=20appears?= =?UTF-8?q?=20out=20of=20viewport=20if=20UI=20scale=20>=201.0=E2=80=9D,=20?= =?UTF-8?q?corrected=20calculation=20of=20allowed=20floater=20rect=20in=20?= =?UTF-8?q?docked=20state;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llscriptfloater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index 32fd42aded..eb71cc52c8 100644 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -135,7 +135,7 @@ void LLScriptFloater::setNotificationId(const LLUUID& id) void LLScriptFloater::getAllowedRect(LLRect& rect) { - rect = gViewerWindow->getWorldViewRectRaw(); + rect = gViewerWindow->getWorldViewRectScaled(); } void LLScriptFloater::createForm(const LLUUID& notification_id) -- cgit v1.2.3 From 1394d21b7a525c4cbe6780dbd478d3bf2f946fa3 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 2 Mar 2010 09:53:52 +0000 Subject: CID-436 Checker: NULL_RETURNS Function: RecoveredItemCB::fire(const LLUUID &) File: /indra/newview/llappearancemgr.cpp --- indra/newview/llappearancemgr.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'indra') diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 03782510f2..5c21be8c32 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -575,12 +575,16 @@ public: mWearable->setItemID(item_id); LLPointer cb = new RecoveredItemLinkCB(mType,mWearable,mHolder); mHolder->mTypesToRecover.erase(mType); - link_inventory_item( gAgent.getID(), - item_id, - LLAppearanceManager::instance().getCOF(), - itemp->getName(), - LLAssetType::AT_LINK, - cb); + llassert(itemp); + if (itemp) + { + link_inventory_item( gAgent.getID(), + item_id, + LLAppearanceManager::instance().getCOF(), + itemp->getName(), + LLAssetType::AT_LINK, + cb); + } } private: LLWearableHoldingPattern* mHolder; -- cgit v1.2.3 From 0c6cf6fa784d67168d0accd664a312ca76e4f2fa Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 2 Mar 2010 09:56:03 +0000 Subject: CID-435 Checker: MISSING_BREAK Function: friendship_offer_callback(const LLSD &, const LLSD &) File: /indra/newview/llviewermessage.cpp not-a-bug --- indra/newview/llviewermessage.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index b36f58f8ff..ae31c9732c 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -207,6 +207,7 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response) LLNotificationsUtil::add("FriendshipDeclinedByMe", notification["substitutions"], payload); } + // fall-through case 2: // Send IM - decline and start IM session { // decline -- cgit v1.2.3 From d1d195ba904490c19faf2078560f49c3a6b16a18 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 2 Mar 2010 09:58:34 +0000 Subject: CID-433 Checker: FORWARD_NULL Function: LLTabContainer::reshapeTuple(LLTabTuple *) File: /indra/llui/lltabcontainer.cpp --- indra/llui/lltabcontainer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 85ae13a889..30fc7babae 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -1649,7 +1649,7 @@ void LLTabContainer::reshapeTuple(LLTabTuple* tuple) if(mCustomIconCtrlUsed) { LLCustomButtonIconCtrl* button = dynamic_cast(tuple->mButton); - LLIconCtrl* icon_ctrl = button->getIconCtrl(); + LLIconCtrl* icon_ctrl = button ? button->getIconCtrl() : NULL; image_overlay_width = icon_ctrl ? icon_ctrl->getRect().getWidth() : 0; } else -- cgit v1.2.3 From 9c8a8f388ab24c404f19602e156a76ad1a03b841 Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Tue, 2 Mar 2010 12:03:28 +0200 Subject: Fixed normal bug EXT-5654 - 'More' link doesn't show all text in pick/classified description. Encreased expandable text box max length to match classified description max length. --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml | 1 + indra/newview/skins/default/xui/en/panel_pick_list_item.xml | 1 + 2 files changed, 2 insertions(+) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml index 1375eb87d9..996e28c575 100644 --- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml @@ -64,6 +64,7 @@ layout="topleft" left="103" name="description" + textbox.max_length="1024" textbox.show_context_menu="false" top_pad="0" width="178" diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index 8b25fb5d2a..715dc5f23c 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -64,6 +64,7 @@ layout="topleft" left="103" name="picture_descr" + textbox.max_length="1024" textbox.show_context_menu="false" top_pad="0" width="178" -- cgit v1.2.3 From bfd1fd9936632bd3ed7724695d5c0ae87a707e3d Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Tue, 2 Mar 2010 11:06:06 -0800 Subject: DEV-46346 Cycle5 DE and JA change --- .../skins/default/xui/de/floater_avatar_textures.xml | 2 +- .../newview/skins/default/xui/de/floater_customize.xml | 2 +- indra/newview/skins/default/xui/de/panel_edit_skin.xml | 2 +- .../skins/default/xui/de/panel_region_estate.xml | 8 ++++---- indra/newview/skins/default/xui/de/strings.xml | 18 +++++++++--------- indra/newview/skins/default/xui/ja/strings.xml | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml index cf1b809aa1..92c0c4a27a 100644 --- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml @@ -16,7 +16,7 @@ - + diff --git a/indra/newview/skins/default/xui/de/floater_customize.xml b/indra/newview/skins/default/xui/de/floater_customize.xml index b1e9ef6f19..1fc6387811 100644 --- a/indra/newview/skins/default/xui/de/floater_customize.xml +++ b/indra/newview/skins/default/xui/de/floater_customize.xml @@ -50,7 +50,7 @@