summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-07-30EXT-8161 FIXED Moved Invite button 5 px to the right to prevent cropping its ↵Mike Antipov
border (when selected) by parent. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/827/ --HG-- branch : product-engine
2010-07-30Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-07-30remove a nonsense assert that gcc was choking on.Tofu Linden
2010-07-30merge from viewer-releaseTofu Linden
2010-07-30merge from PE's viewer-releaseTofu Linden
2010-07-30merge from PE's viewer-trunkTofu Linden
2010-07-30mergeTofu Linden
2010-07-30EXT-8522 FIXED (Code improvements: Update a way in which Nearby people list ↵Mike Antipov
is controlled depend on its visibility to user) 1. Removed special processing of Nearby People List Updater when: * tabs in People panel are changed; * People panel change its visibility. 2. Subscribed Nearby People List Updater's setActive() method directly to Nearby list Panel's onVisibleChange callback. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/825/ --HG-- branch : product-engine
2010-07-29Yet more cleanup around llmediadataclient.Monroe Linden
In LLVOVolume, added a count of LLMediaDataClientObjectImpl objects referencing each LLVOVolume object. This allows LLVOVolume::markDead() to skip the relatively expensive calls to removeFromQueue() when the LLVOVolume is known to have no active references. Refactored LLMediaDataClient and its two child classes so that only LLObjectMediaDataClient has the round-robin queue (LLObjectMediaNavigateClient doesn't need it), and cleaned up some of the virtual function hierarchy around queue processing. In LLMediaDataClient, added tracking for requests that aren't currently in a queue (i.e. requests that are in flight or waiting for retries) so they can be found when their objects are marked dead. LLMediaDataClient::Request now directly keeps track of the object ID and face associated with the request. Removed the "markedSent" concept from requests. Requests that have been sent are no longer kept in a queue. The Retry timer now references the Request object instead of the Responder. Replaced LLMediaDataClient::findOrRemove() with separate template functions for find and remove.
2010-07-29removed unnecessary hack (no repro for EXT-8259, possibly due to other ↵Richard Linden
recent lltextbase changes)
2010-07-29mergeTofu Linden
2010-07-29mergeRichard Linden
2010-07-29fix for vertical truncation of sidebar headersRichard Linden
2010-07-29fix for truncated text renderingRichard Linden
2010-07-29Backed out changeset b4c03b57a34fTofu Linden
2010-07-29EXT-8043 FIXED Fixed wrong position of notifications when 'Move' or 'View' ↵Andrew Dyukov
floaters are open and docked. Bug was caused by LLDockableFloater's mOverlapsScreenChannel to false only in one of it's constructors. So some floaters got initial value of mOverlapsScreenChannel depending on system- that's why bug reproduced on Windows and didn't reproduce on Linux. - Moved setting mOverlapsScreenChannel to false into LLDockableFloater's init() which is called by all of it's constructors. Reviewed by Alexei Arabadji at https://codereview.productengine.com/secondlife/r/818 --HG-- branch : product-engine
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-29EXT-7406 RE FIXED Replaced inventory collector for objects to exclude links ↵Mike Antipov
from the Edit Outfit->Add More panel. Restored fix that was previosly committed in 76bd52803506 and then somewhy reverted in 5b5cc4a8642d. --HG-- branch : product-engine
2010-07-29remove panel_bars.xml which I can't find any trace of being used.Tofu Linden
2010-07-29mergeVadim Savchuk
--HG-- branch : product-engine
2010-07-29Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-07-29mergeMike Antipov
--HG-- branch : product-engine
2010-07-29EXT-7706 FIXED Implemented delayed friends cards synchronization and filling ↵Mike Antipov
People/Friends tab with data until it is visible to user first time. * Moved location of synchronization of the Friends/All inventory folder with friends list from startup to first requesting of data. * Also updated "update Friends list" logic to be really trigged only when Friends tab is visible to user. NOTE: * Friends List/All is filled with some delay on first opening. TODO: refactoring is needed to switch code of updating People/nearby list to use the same approach as for Friends. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/805/ --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-29EXT-8179 FIXED (Group profile: 'Save' button remains disabled if state of ↵Paul Guslisty
check-boxes was changed during refreshing of 'General' accordion) Disable accordion while refreshing group properties so the user could not change properties during refresh Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/815/ --HG-- branch : product-engine
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