summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-07-30Upgraded NVIDIA 120 and 220 to class 1. They're performing too well.Palmer
2010-07-30fix for DEV-52379 (viewer is not successfully caching object goemetry)Andrew Meadows
There was a typo between the files saved and those loaded. saved in sobjects_gridx_gridy.slc bload loaded from objects_gridx_gridy.slc Q will review later ;-)
2010-07-30MergeKent Quirk
2010-07-30Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1Kent Quirk
2010-07-30merge from PE's viewer-releaseTofu Linden
2010-07-29Backed out changeset b4c03b57a34fTofu Linden
2010-07-29EXT-8501 FIXED Check menu items always looked as checked.Vadim Savchuk
Reason: Check menu items (instances of LLMenuItemCheckGL) had used LLUICtrl::getValue() to know whether they should draw the checkmark. Recently this was broken when getValue() was overriden in LLMenuItemCallGL to return a string. Fix: Overriden getValue() in LLMenuItemCheckGL to return a boolean value, not a string. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/821/ --HG-- branch : product-engine
2010-07-29WEB-1819 FIXED Find always resets to start pageTofu Linden
(plus many dupes). Enough seesawing, I hope - see WEB-1819 for discussion and the nature of the compromise. Patch by Kitty Barnett, reviewed by my.
2010-07-29mergeTofu Linden
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-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-28Merge from default branchVadim Savchuk
--HG-- branch : product-engine
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-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-27automated mergeLoren Shih
2010-07-27Fix implicit downcast in world map change.Tofu 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-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-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-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-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 01:20:45 +0000