summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-07-28merge from viewer-releaseTofu Linden
2010-07-28merge from PE's viewer-trunkTofu Linden
2010-07-28merge from PE's viewer-releaseTofu Linden
2010-07-27Merge from dessie/viewer-releaseRichard 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-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-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
2010-07-26EXT-7963 FIXED (Edit Outfit > Add More > Do not switch to next item type ↵Paul Guslisty
after add/replace) - Added selected item type (in flat list view) as criterion when determining filter type in 'Add More' panel - Fixed LLAccordionCtrl::getSelectedTab() method. When 'selection_enabled = false' for LLAccordionCtrlTab, LLAccordionCtrl::getSelectedTab() returned NULL, even if some accordion tab was selected. Now it's OK. Method returns currently selected LLAccordionCtrlTab. Reviewed by Mike Antipov, Neal Orman and Richard Nelson at https://codereview.productengine.com/secondlife/r/790/ --HG-- branch : product-engine
2010-07-26(hairy) merge from viewer-releaseTofu Linden
2010-07-26merge from PE's viewer-releaseTofu Linden
2010-07-26EXT-8329 FIXED Provided disabling 'Wear Item' button after item was worn.Alexei Arabadji
Details: 1 Updated condition is item can be worn considering situation when item is copied in COF but is not worn. 2 Avoided code duplication in method LLOutfitsList::canWearSelected() reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/785/ --HG-- branch : product-engine
2010-07-23Fix EXT-8483 second iteration: use old nodeId when available but try new ↵Andrew A. de Laix
machine id when not so reported id stays consistent with prior versions most of the time.
2010-07-23mergeBrad Payne (Vir Linden)
2010-07-23Fixed reversal of replace/add logic with clothingBrad Payne (Vir Linden)
2010-07-23Removed a bunch of templates and inlining through the miracle of boost::functionBrad Payne (Vir Linden)
2010-07-23Fixed PROJECT_secondlife-bin_TEST_lllogininstance unit test to fix Linux build.Sergei Litovchuk
--HG-- branch : product-engine
2010-07-23EXT-8420 PARTIAL_FIX Localized the "Online" string used as a group member ↵Vadim Savchuk
status. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/792/ --HG-- branch : product-engine
2010-07-23EXT-8481 FIXED Wear button in My Outfits being enabled when worn item is ↵Vadim Savchuk
selected. - Fixed condition for enabling the Wear button in My Outfits. - The button was always enabled when when COF change completes, I fixed that as well. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/800/ --HG-- branch : product-engine
2010-07-23EXT-8299 FIXED Added rearranging of the group accordion to fit all space if ↵Mike Antipov
only General tab is visible. Also fixed name of accordion in code to be consistent with xml. Replaced findChild with getChild (when getting accordion and its tabs) to avoid extra checks against NULL of returned pointers and have warnings in log is xml is not consistent with code. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/798/ --HG-- branch : product-engine
2010-07-23EXT-8394 FIXED Added "New Note" to dictionary of predefined Inventory ↵Mike Antipov
items/folders. "New Note" should be translated on other languages in strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/795/ --HG-- branch : product-engine
2010-07-23automated mergeLoren Shih
2010-07-23EXT-6739 FIXED Provided updating of object inspector gear menu 'Touch' and ↵Alexei Arabadji
'Sit' entries. Details: 1 Provided using Object.EnableSit and Object.EnableTouch callbacks for both object menu and inspector gear menu. Now default menu item label stores in hash map and since callback receives triggered control no need to hardcode updating menu item labels from callback. 2 Removed redundant attribute 'parameter' from menu xml's since now handler callbacks receives triggered menu item as function parameter. 3 Replaced LLObjectEnableTouch class with enable_object_touch function, since there no need on triggering callback on menu commit event. 4 Added symmetric method LLMenuItemGL::getValue(). 5 Removed unused "Object.EnableGearSit" callback. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/774/ --HG-- branch : product-engine
2010-07-23merge from PE's viewer-releaseTofu Linden
2010-07-22MergeAndrew A. de Laix
2010-07-22Fix EXT-8483: switch to LLMachineID::getUniqueID which should always work on ↵Andrew A. de Laix
windows (no dependency on Netbios).
2010-07-22OH NO! This may be my last merge! You might want to read all of this...Palmer
Whatever will I do if I can no longer merge in the indra codebase? What has my life come to? Without merging, who am I? Why am I here? I like cupcakes. Merging makes me feel complete. Like doing something without really doing something. I say merge, and it merges. I like not having to do three way diffs, but still claim I'm merging. Three way merging is no fun. You're still reading this. You deserve a cupcake. You read checkins. You're special. You're either dessie, erica, or brad. I'll miss you guys. Keep them doggies mergin.
2010-07-22EXT-7145 - Handle http redirects in viewer properly. Didn't work before.Palmer
Reviewed by Bao and Babbage
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 14:59:20 +0000