summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-07-29EXT-7565 FIXED RECOVER FROM BAD MERGE (Would be nice to preserve selection ↵Paul Guslisty
while switching between folder/list view modes) Added missed (during bad merge 14077:5b5cc4a8642d) code to the llpanloutfitedit(.h/.cpp): recover LLPanelOutfitEdit::updateWearablesPanelVerbButtons() and LLPanelOutfitEdit::saveListSelection() methods Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/817/ --HG-- branch : product-engine
2010-07-29mergeTofu Linden
2010-07-29merge from viewer-releaseTofu Linden
2010-07-29EXT-8429 FIXED Added a workaround to localize server hardcoded "Conference" ↵Mike Antipov
string for incoming ad-hoc chats. Added a new string "conference-title-incoming" to strings.xml For now the "Conference" word is localized wherever this session name is shown: * IM window title * Voice notifications Further Localization is out of scope of this ticket and will be done in a separate localization cycle. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/816/ --HG-- branch : product-engine
2010-07-28mergeBrad Payne (Vir Linden)
2010-07-28EXT-8221 FIX - fixed invalid array index in a vector<LLMultiGesture*>Brad Payne (Vir Linden)
2010-07-28EXT-8258 ADDITIONAL FIX Enable the 'Trash' button in 'My Inventory' when a ↵Vadim Savchuk
selected item gets worn. This is an additional fix to the one approved in https://codereview.productengine.com/secondlife/r/772/. Looks like sometimes get_is_item_worn() fails to determine that an item is actually worn. I suppose it happens when the item is already linked to COF but not yet known to LLAgentWearables. So I try fixing it by adding a COF links check to get_is_item_worn(), so that an item is considered worn as soon as it's linked to COF. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/822/ --HG-- branch : product-engine
2010-07-28CT-575 WIP FR linguisticEli Linden
2010-07-28EXT-8361 REFIXED Tooltips in Nearby Media window in the French viewer.Vadim Savchuk
Restored a part of my fix that was somewhy reverted by Eli in rev. 0d364d4ddd91. --HG-- branch : product-engine
2010-07-28EXT-8310 REFIXED Localized currency format in the Buy Land floater.Vadim Savchuk
I'm actually restoring a part of the fix that was previosly committed in 75a1d14d6cc5 and then somewhy reverted in 0d364d4ddd91. Trivial change, not reviewed. --HG-- branch : product-engine
2010-07-28EXT-7015 ADDITIONAL FIX Updated condition of hiding wear related context ↵Alexei Arabadji
menu entries from "hide if all can't be worn" to "hide if any can't be worn". reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/813/ --HG-- branch : product-engine
2010-07-28Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-28Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-28No Ticket Just updated comments.Mike Antipov
--HG-- branch : product-engine
2010-07-28fix an implicit downcast in font code.Tofu Linden
2010-07-28merge from viewer-releaseTofu Linden
2010-07-28merge from PE's viewer-trunkTofu Linden
2010-07-28EXT-2707 ADDITIONAL FIX Fixed wrong icon showing for coalesced objects in ↵Andrew Dyukov
"Add More" panel. Problem was caused by getting item's icon always with FALSE value of item_is_multi argument in LLPanelInventoryListItemBase::postBuild(). - Used II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS flag to determine whether item is multiobject and getting appropriate icon. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/812/ --HG-- branch : product-engine
2010-07-28merge from PE's viewer-releaseTofu Linden
2010-07-28EXT-8285 FIXED prevented wrong handling in accordion of the ↵Mike Antipov
"scrollToShowRect" event from the child accordion tab's scroll container. This problem begins from expanding accordion_tab: 1. adjustToFitScreen - calls adjustContainerPanel with "fit screen" rectangle (calls reshape() and resize()). Enter adjustContainerPanel("fit screen") 2. reshape calls ensureSelectedVisible -> scrollToShowRect... scrollToShowRect notifyParent about "scrollToShowRect" (notifiParent is sync call) Enter LLAccordionCtrl::notifyParent("scrollToShowRect") 4. AccordionCtrl handles "scrollToShowRect" notification and perform adjustContainerPanel with "another" rectangle. Perform adjustContainerPanel("another") // At least I have not seen 3rd recursive call of adjustContainerPanel 5. Exit LLAccordionCtrl::notifyParent("scrollToShowRect") 6. Exit reshape("fit screen"). 7. setRect("fit screen"). 8. Exit adjustContainerPanel("fit screen"). ... As result we get AccordionTab that reshaped to "another" rectangle and resized to "fit screen" rectangle. + Fixed by handling "scrollToShowRect" message in LLAccordionCtrlTab from "LLScrollContainer". + Removed the workaround comment. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/727/ --HG-- branch : product-engine
2010-07-27Merge from dessie/viewer-releaseRichard Linden
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-27EXT-8491 FIXED Crash in LLAppearanceMgr::addCOFItemLink().Vadim Savchuk
Reason: When you click on a clothing link in COF, LLAppearanceMgr::wearItemOnAvatar() removes all COF links of the clicked wearable type -- thus invalidating all previously obtained LLViewerInventoryItems for those links -- and then passes such an invalid item (item_to_wear) to addCOFItemLink() which of course crashes. Fix: 1. Handle this case in wearItemOnAvatar(): don't try wearing COF items. 2. Disable the Wear button in the inventory SP when a COF item is selected. 3. Fixed get_can_item_be_worn() to return FALSE for items which are in COF or have links in COF. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/811/ --HG-- branch : product-engine
2010-07-27mergeRichard Linden
2010-07-27EXT-8366 FIXED ([HARD CODED] ALL LANGS Whole Item Profile window is ↵Paul Guslisty
untranslated in the French viewer) - Added 'name' attribute for untranslated panel in EN and all other locales Reviewed by Mike Antipov and Vadim Savchuk at https://codereview.productengine.com/secondlife/r/808/ --HG-- branch : product-engine
2010-07-27EXT-8350 FIXED ([HARD CODED] ALL LANGS Untranslated folder names under ↵Paul Guslisty
French Group Profile (roles and powers)) Added translation of folders to the strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/810/ --HG-- branch : product-engine
2010-07-27EXT-2707 FIXED Fixed incorrectness of coalesced objects icons in inventory.Andrew Dyukov
Bug was caused by multiobject's icon name index substitution with ordinary object's one. It happened because index was set depending on asset type in switch that followed "if" which set index for multiobject regardless of its result. - Added returning index icon name inside of "if" block to avoid change of the index by switch for multiobject. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/804/ --HG-- branch : product-engine
2010-07-27Performed necessary refactoring after merge rev. 14093:babb41195f70Alexei Arabadji
--HG-- branch : product-engine
2010-07-27automated mergeLoren Shih
2010-07-27Merge with head.Mike Antipov
Resolved conflict in indra/newview/lloutfitslist.cpp to use changes from viewer-release. Rejected changes in that file coming with 10f02c59761c (EXT-7015 FIXED Avoided wearing item moved to trash.) It will be refixed in a separate commit. --HG-- branch : product-engine
2010-07-27EXT-7015 FIXED Avoided wearing item moved to trash.Alexei Arabadji
Details: Disabled wear button and hidden related context menu entries if base object of inventory link is in trash. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/806/ --HG-- branch : product-engine
2010-07-27mergeTofu Linden
2010-07-27Fix implicit downcast in world map change.Tofu Linden
2010-07-27slightly-hairy merge from viewer-releaseTofu Linden
2010-07-27merge from PE's viewer-trunkTofu Linden
2010-07-27merge from PE's viewer-releaseTofu Linden
2010-07-27mergeTofu Linden
2010-07-26Implementation for EXT-7291 (World Map in the Viewer2 needs a way to type in ↵callum
region coordinates) Reviewed by PB
2010-07-26EXT-8918 FIXED Incorrect right-click options for library itemsLoren Shih
Library items have "Share" disabled.
2010-07-26EXT-8229 FIXED Add "--no options--" automatically instead of special casing ↵Loren Shih
for it in right-click menus Changed logic so that the menu is post-processed and, at that time, nooptions is added if the menu is seen to be empty.
2010-07-26EXT-8010 FIXED Implemented special behaviour of avatar links.Andrew Dyukov
Avatar links are now underlined only on hover. Also they have the same color as other links. - Underlining text and getting it back to normal are done in handleHover() and draw() of new LLOnHoverChangeableTextSegment class derived from LLNormalTextSegment. This class has two pointers to styles- one for style which will be used for text on hover, and another otherwise. This special type of text segment is used if link's boolean member mUnderlineOnHoverOnly is true. So it is URL's flag depending on which textbase adds new text segment(like it currently happens with mDisabledLink). - Changed avatar link color in colors.xml to emphasis (because it was white before and was inconsistent with other links). Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/749/ --HG-- branch : product-engine
2010-07-26EXT-8232 FIXED (Truncation of German strings on Buy Land window)Paul Guslisty
- Added wrap=\"true\" for text boxes in which truncation occurs and increased their height to contain another one line Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/802/ --HG-- branch : product-engine
2010-07-26EXT-2707 FIXED Fixed incorrectness of coalesced objects icons in inventory.Andrew Dyukov
Bug was caused by multiobject's icon name index substitution with ordinary object's one. It happened because index was set depending on asset type in switch that followed "if" which set index for multiobject regardless of its result. - Added returning index icon name inside of "if" block to avoid change of the index by switch for multiobject. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/804/ --HG-- branch : product-engine
2010-07-26EXT-8069 FIXED "Show Advanced Menu" item is moved to "Advanced/Shortcuts" ↵Mike Antipov
submenu and made invisible. (invisible - because it is still located in menu it toggles) Note: We can not completely remove this menu item to keep hot key workable. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/803/ --HG-- branch : product-engine
2010-07-26EXT-8257 FIXED Made "Expand" and "Collapse" menu items visible in Places ↵Mike Antipov
gear menu mutually exclusive. Root cause: ========== The same menu is used to be shown as context and gear menus. But visibility of context Folder View's menu is processed in a separate way. So, once visibility of menu items is changed in context menu - it is unchanged in gear menu. Also it was possible situation when both "Expand" and "Collapse" menu items were visible in gear menu (If it was opened before any context menu) FIX: === Added "on_visible" callbacks for "Expand" and "Collapse" menu items to set proper visibility in "gear" menu. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/801/ --HG-- branch : product-engine
2010-07-26EXT-8391 FIXED Landmark creation and error handling.Sergei Litovchuk
- Added displaying error messages in Create Landmark panel upon remote parcel request fail. - Moved landmark creation from LLPanelLandmarkInfo::processParcelInfo() because we use only agent's current coordinates instead of waiting for remote parcel request to complete. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/793/. --HG-- branch : product-engine
2010-07-26dos2unixTofu Linden
2010-07-26Conflict resolution. Erring on the side of viewer-release.Tofu Linden
2010-07-26mergeVadim Savchuk
--HG-- branch : product-engine
2010-07-26Merge from default branchVadim Savchuk
--HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 11:17:38 +0000