summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-26EXT-8318 FIX IMPROVED converted EOLsMike Antipov
--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-8318 FIX IMPROVED Code is refactored - avoid using of a separate call of ↵Mike Antipov
the MultiByteToWideChar to get length of output string. Assumprion is: wide char buffer requires not more than input string length plus one for a null terminator. Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/775/ --HG-- branch : product-engine
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-23first pass ui rendering performance improvementsRichard Linden
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-23mergeMike Antipov
--HG-- branch : product-engine
2010-07-23EXT-8318 ADDITIONAL FIXED ensure that thousands separator is in utf8 format ↵Mike Antipov
(on Windows) before converting it to LLWString. Problem on Windows: ================== LLPanelMainInventory::updateItemcountText() formats number using viewer locale. non-break space is detected as unknown symbols while converting utf8str_to_wstring when formatted text is set to LLTextBox. FIX: === Added converting of string to multi-byte string and then to utf8 string while formatting on Windows. created opposite to "ll_convert_wide_to_string" function "ll_convert_string_to_wide" and helper function to call both of them. It is used now to convert result of formatted string while formatting integer number in locale. Fix affects Windows only. Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/775/ --HG-- branch : product-engine
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-22pushed 2-1-release tagDessie Linden
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 07:54:55 +0000