summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-22EOL added.Palmer
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
2010-07-22EXT-7511 FIXED Fixed cropping of selection in Edit Outfit.Andrew Dyukov
Cropping was caused by drawing separator over bottom part of the item (including selection). - Moved separator under the item- not inside of it. This way item and selection are not cropped. The only requirement for using lists that consist of items with separators is that their item_pad attritubute is >= height of separator. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/780/ --HG-- branch : product-engine
2010-07-22EXT-8342 FIXED Fixed displacement of decription textbox in Place Profile ↵Andrew Dyukov
after reshape. Bug was reproducible on Windows and not on Linux because of different moment when onTopLost() was called for textbox. On Windows it happened only after reshape, on Linux- before reshape. Made windows behaviour in case of top lost consistent with Linux behaviour. - An if was added into LLPanelPlaceInfo::reshape to force collapsing description textbox on Windows at the beginning of reshape (the only case when reshape is skipped there now is when it's caused by expanding/collapsing this textbox, so called_from_parent for panel is FALSE). Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/779 --HG-- branch : product-engine
2010-07-22mergeRichard Linden
2010-07-22fix for checkbox truncationRichard Linden
2010-07-22EXT-8051 FIXED Change cameraCustomizeAvatar calls to use ↵Loren Shih
gAvatarp->isUsingBakedTextures Changed some uses of cameraCustomizeAvatar as appropriate.
2010-07-22Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-07-22ND-47671 WIP FR linguisticEli Linden
2010-07-22more debug code for EXT-6791: [crashhunters] Intel 965 Crash in ↵Xiaohong Bao
glCopyTexSubImage2D
2010-07-22EXT-8457: FIXED: crash at [1] LLImageGL::checkTexSize(bool) [secondlife-bin ↵Xiaohong Bao
llimagegl.cpp]
2010-07-22EXT-5403 FIXED texture picker to scroll to selected texture initially after ↵Sergei Litovchuk
being open. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/736/. --HG-- branch : product-engine
2010-07-23EXT-8421 FIXED hardcoded strings.Sergei Litovchuk
- Replaced hardcoded strings under Group Profile Land/Assets with related strings from strings.xml - Added new string "Group" to strings.xml Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/794/. --HG-- branch : product-engine
2010-07-23Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-23EXT-8318 ADDITIONAL FIXED avoid an extra copy of std::stringMike Antipov
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/775/ --HG-- branch : product-engine
2010-07-22EXT-8153 FIX - modified replace logic when wearing multiple itemsBrad Payne (Vir Linden)
2010-07-22EXT-8392 FIXED Localized folder name in the landmark creation notification.Vadim Savchuk
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/789/ --HG-- branch : product-engine
2010-07-22EXT-8378 FIXED Made area format localizable in World Map and Group Info -> ↵Vadim Savchuk
Roles. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/788/ --HG-- branch : product-engine
2010-07-22Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-22EXT-8459 FIXED preventing crashes: 1) ensure that pointer to inventory item ↵Mike Antipov
is still valid when landmark is loaded from notecard and 2) adding a check for region capability There are two reasons of the crash reported in the bug: * absence of the "CopyInventoryFromNotecard" capability in region (which leads to crash while logging of a LL_ERRS) * referencing to an invalid pointer to LLInventoryItem in callback. The first issue is fixed by preventing sending of the "CopyInventoryFromNotecard" message if it is not supported (in the "copy_inventory_from_notecard()") The second issue caused by such reason: * Notecard stores LLPointer to each embedded inventory item * When Landmark is clicked it should be opened in Places Panel and inventory item should copied into agent inventory * If it is unknown to agent it is requested and pointer (but not LLPointer!) to inventory item was bound to an appropriate callback * Then when landmark is loaded that inventory item is copied to inventory. * If notecard was closed before callback was trigged all instances to embedded inventory items were destroyed. This leads to crash when trigged callback tries to reference to bound pointer to inventory item (for landmarks) Fix is to pass LLPointer instead of pointer to inventory item into callback to ensure item is valid when it is needed. Details: * updated LLEmbeddedItems::getEmbeddedItem() to return LLPointer to inventory item (and renamed to getEmbeddedItemPtr) * updated LLViewerTextEditor::openEmbeddedItem() to get LLPointer to inventory item * updated LLViewerTextEditor::openEmbeddedLandmark() to get LLPointer to inventory item Patch also contains some more places where pointer is replaced with LLPointer to be consistent. NOTE: there are several LLViewerTextEditor::openEmbeddedXXX() methods which still get pointer to inventory item. It is safe for now because they use it synchronously. I have added a note at their declaration. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/784/ --HG-- branch : product-engine
2010-07-22merge from PE's viewer-releaseTofu Linden
2010-07-21mergeRichard Nelson
2010-07-21reverted bad workaround for content sizing problemRichard Nelson
2010-07-21EXT-8135 FIX - use LLUpdateAppearanceOnDestroy callback to postpone ↵Brad Payne (Vir Linden)
appearance update until all links are created
2010-07-21EXT-8401 FIXED Added new text prevalidation callback to allow ascii ↵Sergei Litovchuk
characters and new line in text editor. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/786/. --HG-- branch : product-engine
2010-07-21EXT-8164 FIXED (Accordions should be reset to default state after Edit ↵Andrew Polunin
Outfit panel reopening) Now accordion on panels 'Edit Outfit', 'Editing Shape', 'Editing Hair', 'Editing Eyes', 'Editing Skin', 'Group Profile' and 'Place Profile' are reset when the panels are closed and then opened again. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/782/ --HG-- branch : product-engine
2010-07-21EXT-8205 FIXED (Items in \"Add more\" panel are not sorted by name)Paul Guslisty
- Modified LLWearableItemTypeNameComparator so that it can be more reusable and adjustable - Set LLWearableItemTypeNameComparator for WearableItemsList ('List view' of 'Add More' panel) due to sort clothings by name - Modified and applied patch form https://codereview.productengine.com/secondlife/r/620/diff/2/#index_header. This patch was discarded because specification was changed Reviewed by Mike Antipov and Vadim Savchuk at https://codereview.productengine.com/secondlife/r/765/ --HG-- branch : product-engine
2010-07-21EXT-8412 FIXED (Group Profile > Notices > Add label to + button, move header ↵Paul Guslisty
down) - Added a text label to the + button reading \"New Notice\" - Add more padding between button and content below Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/766/ --HG-- branch : product-engine
2010-07-21Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-21Automated merge with https://hg.productengine.com/secondlife/viewer-release/Alexei Arabadji
--HG-- branch : product-engine
2010-07-21EXT-6527 FIXED Avoided show agent/group SLURL icon in plain text mode.Alexei Arabadji
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/773/ --HG-- branch : product-engine
2010-07-21merge from PE's viewer-publicTofu Linden
2010-07-21mergeTofu Linden
2010-07-20mergeRichard Nelson
2010-07-20EXT-7654 FIX About Land Floater> Icons missingRichard Nelson
2010-07-20Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-07-20EXT-7500: FIXED: Texture Jamming problems with http texture offXiaohong Bao
2010-07-21EXT-8245 FIXED Added passing inventory panel to give_inventory_cb callback ↵Sergei Litovchuk
when called from 'Add More' panel. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/737/. --HG-- branch : product-engine
2010-07-20Automated merge with ssh://nyx@hg.lindenlab.com/q/viewer-release/Nyx (Neal Orman)
2010-07-20EXT-8119 tattoo texture remains grey until rebakeNyx (Neal Orman)
texture pipeline always returns a valid image, we needed to check the image id against IMG_DEFAULT instead of NULL. This causes the image to be correctly set to IMG_DEFAULT_AVATAR, which is never rendered during layer baking. Code reviewed by Seraph
2010-07-20mergeRichard Nelson
2010-07-20EXT-8463 FIXED Crash in IM/chat floaters.Vadim Savchuk
Reason ====== Each message in an IM/chat session has a header. The header shows an (i) button on hover and hides it when mouse leaves the header. The button is shown by adding it as a header child and hidden by resetting the button parent. So, if you close the IM session so that the hovered header doesn't get the MouseLeave message (e.g. by Ctrl+W), the button gets destroyed. If you then open the IM session again and hover a message header, the destroyed button is referenced, which leads to crash. Fix === We make sure that when a hovered message header is being destroyed (by closing the IM session), the button is detached (i.e. its parent gets reset), so that it remains usable. I also add a couple of checks for the case when the (i) button fails to construct from XML file. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/783/ --HG-- branch : product-engine
2010-07-20automated mergeLoren Shih
2010-07-20EXT-8448 FIXED [crashhunters] Crash in LLFolderBridge::folderOptionsMenu(), ↵Loren Shih
and Trash folder options incorrect Minor fix to previous checkin for this crash. This fixes the UI issue where you're seeing the context options for the previous folder you clicked when you click on trash/library.
2010-07-20mergeBrad Payne (Vir Linden)
2010-07-20EXT-8360 FIX - cleanupBrad Payne (Vir Linden)
2010-07-20EXT-8360 FIX - item name changes get propagated to the various appearance ↵Brad Payne (Vir Linden)
panel widgets
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 21:39:54 +0000