summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-04-07ES linguisticEli Linden
2010-04-07Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkXiaohong Bao
2010-04-07fix for all wierd crashes happening to lltexturecache.cpp, cuased by running ↵Xiaohong Bao
viewer 2.0 and viewer 1.23 at the same time. Specifically for the following jiras: EXT-6692: crash at LLTextureCache::readEntryFromHeaderImmediately [secondlife-bin lltexturecache.cpp:1145] EXT-6691: crash at LLTextureCache::writeEntryToHeaderImmediately [secondlife-bin lltexturecache.cpp:1126] possible fix for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-07Shadow aliasing fix WIPDave Parks
2010-04-09merge from viewer-trunkTofu Linden
2010-04-07mergeRichard Linden
2010-04-07EXT-6745 : Refactor LLFetchComboObserver to use LLFetchItems and ↵Loren Shih
LLFetchDescedents instead of code duplication Took out a bunch of code duplication from the FetchComboObserver and am using the LLFetchItems/DescendentsObservers instead. Also added some comments and made some minor superficial cleanup to LLInventoryObserver done().
2010-04-07MergeEli Linden
2010-04-07mergeRichard Linden
2010-04-07EXT-4885 - [DnD] cannot drag slurls from Google Chrome into SL on windowsRichard Linden
2010-04-07mergeVadim Savchuk
--HG-- branch : product-engine
2010-04-07Fixed major bug EXT-6602 (Sidebar panel focus goes to filter field, ↵Andrew Dyukov
obscuring watermark text). -Set focus on sidetray tabs open to tab containers which hold panels with lists, so now filter fields are not emptied. Used "default_tab_group" + "tab_group" attributes in xml to implement this. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/198/ --HG-- branch : product-engine
2010-04-07Fixed normal bug EXT-6712(SLapp: nothing happens after click on ↵Eugene Mutavchi
'secondlife:///app/group/list/show' link from Nearby chat) - added showing my groups tab in people panel. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/196/ --HG-- branch : product-engine
2010-04-07Fixed normal bug EXT-6715 (Favorites bar: bottom scroll button of overflow ↵Eugene Mutavchi
list is corrupted ) - restored 'arrow_down.tga' image, which is used by LLMenuScrollItem. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/197/. diff -r f3fc1679ec4e -r f4652f182c84 indra/newview/skins/default/textures/arrow_down.tga Binary file indra/newview/skins/default/textures/arrow_down.tga has changed --HG-- branch : product-engine
2010-04-07mergeVadim Savchuk
--HG-- branch : product-engine
2010-04-07Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-04-07Fixed major bug EXT-6661 (chat log paths reset back to default)Mike Antipov
* Removed unused InstantMessageLogFolder * Restored initializing logic of InstantMessageLogPath value from 1.23 to share setting between viewers. * Restored unused in 2.0 "LogChatTimestamp" and "LogChatIM" settings to avoid removing of them in 2.0 * Restored default value of the "Save local chat log" setting from 1.23 & replaced with 2.0 own setting (LogNearbyChat was: LogChat) Reviewed by Igor Borovkov & Kent Quirk at https://codereview.productengine.com/secondlife/r/193/ (transplanted from 43297b92c1bb7487dab6610bea61acac4c355878)
2010-04-14Fixed major bug EXT-6802 (Cancelling out of People Chooser while Searching ↵Mike Antipov
Causes Crash) * Added check of Avatar Picker floater (People Chooser) against NULL in search callback. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/236/ (transplanted from 480f67e4eac0223626ce549a20760e81c4bce5b1)
2010-04-16Fixed major bug EXT-6851 (Moderator is unable to mute group voice chat ↵Mike Antipov
participant after his reconnect) Reason: not proper condition to check is LLSpeaker is in voice channel (implemented for EXT-3944) Fix: Updated condition to check is speaker in voice channel state. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/242/ (transplanted from fb2af72d10231e04b2e79a7d487ea9e8559c14b8)
2010-04-20Merge.Kent Quirk
2010-04-20set the patch versionKent Quirk
2010-04-20Merge hotfixbeta into hotfixKent Quirk
2010-04-14MergeKent Quirk
2010-04-14update version numberKent Quirk
2010-04-14MergeKent Quirk
2010-04-14Merge backout of EXT-1655Kent Quirk
2010-04-14This change originally to fix EXT-1655 has caused a failure to render ↵Kent Quirk
sitting avatars (EXT-6835). We can probably find a "right" fix, but for now backing it out. Backed out changeset bd384ded4268
2010-04-14MergeKent Quirk
2010-04-13Supplementary fix for EXT-6663 TOS Screen logic for enabling agreement ↵Aimee Linden
checkbox is questionable If the "alive" check on the ToS page returns before the browser plugin has loaded the Loading page, the checkbox never gets enabled, so postpone the check until the Loading page is up.
2010-04-13Merge Tofu's fix for the build failure introduced in bd384ded4268Kyle Ambroff
2010-04-07Fixed major bug EXT-6661 (chat log paths reset back to default)Mike Antipov
* Removed unused InstantMessageLogFolder * Restored initializing logic of InstantMessageLogPath value from 1.23 to share setting between viewers. * Restored unused in 2.0 "LogChatTimestamp" and "LogChatIM" settings to avoid removing of them in 2.0 * Restored default value of the "Save local chat log" setting from 1.23 & replaced with 2.0 own setting (LogNearbyChat was: LogChat) Reviewed by Igor Borovkov & Kent Quirk at https://codereview.productengine.com/secondlife/r/193/ --HG-- branch : product-engine
2010-04-07EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a ↵Loren Shih
base abstract LLInventoryFetchObserver class Minor cleanup of LLInventoryFetchComboObserver
2010-04-07Update Linux build of LLQtWebKit library.Tofu Linden
This was built from: revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch) revision f35a5eab8c2f in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'cookie-api' branch)
2010-04-07mergeYuri Chebotarev
--HG-- branch : product-engine
2010-04-07fix for EXT-6619 "i" icon appears on top of accordion title in the Group ↵Yuri Chebotarev
Info panel https://codereview.productengine.com/secondlife/r/190/ reviewed mantipov --HG-- branch : product-engine
2010-04-07PE merge from pe-viewer-trunkTofu Linden
2010-04-07mergeTofu Linden
2010-04-07Fixed critical bug EXT-1655 ([BSI] Always flying after pressing "Stand" to ↵Eugene Mutavchi
stand up from an object) - moved restoring the flying of the agent before calling the mAutoPilotFinishedCallback, to allow finished callback to change it. - fixed LLVOAvatar::sitOnObject() to set mIsSitting = TRUE before stoping the autopilot, like it was in 1.23 version. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/185/ --HG-- branch : product-engine
2010-04-07Fixed critical bug EXT-1655 ([BSI] Always flying after pressing "Stand" to ↵Eugene Mutavchi
stand up from an object) - moved restoring the flying of the agent before calling the mAutoPilotFinishedCallback, to allow finished callback to change it. - fixed LLVOAvatar::sitOnObject() to set mIsSitting = TRUE before stoping the autopilot, like it was in 1.23 version. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/185/
2010-04-12MergeKent Quirk
2010-04-12EXT-6808 Update Vivox SDK to 3.1.0001.8385Aimee Linden
2010-04-07Fixed normal bug EXT-6600(Block List button in Preferences does nothing ↵Eugene Mutavchi
prior to login (should be disabled)) - added disabling of Block List button if user is not logged in. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/186/ --HG-- branch : product-engine
2010-04-07fix to the SLE backout.Tofu Linden
2010-04-07merged backout.Tofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-07mergeYuri Chebotarev
--HG-- branch : product-engine
2010-04-07Done normal task EXT-6583 ([TRUNCATION] build > select build tool > create ↵Mike Antipov
tool > texture tab) * Increased spinners' "width" & "label_width" attribute values. Updated checkboxes & "Apply" button placement to be accommodated in tab. The longest label is in 'DE' locale. * Also removed overrides of these widgets in 'fr' & 'it' locales Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/183/ --HG-- branch : product-engine
2010-04-07fixed EXT-5842 There is a lot of unused space in the online/offline toasts,Alexei Arabadji
- decreased on/offline notification toasts width from 305 to 220px; - added toast right alignment; - made toasts for long avatar names taller (according to max length of avatar full name(63 characters) made 3 max line of message text in online/offline toasts, also corrected initial geometry parameters of panel_online_status_toast.xml to allow method LLToastPanel::snapToMessageHeigh works correctly); reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/182/ --HG-- branch : product-engine
2010-04-07(work in progress) EXT-6564(major) - Fix wearable editing panels.Dmitry Zaporozhan
Updated layout of all Edit Wearable panels. Disabled editing of no-modify wearable. Disabled "Save As" for no-copy wearable. Reviewed by Mike Antipov https://codereview.productengine.com/secondlife/r/170/ --HG-- branch : product-engine
2010-04-07Fixed major bug EXT-6534 (Snapshot to Disk with Custom Size, selecting ↵Mike Antipov
Constrain Proportions causes snapshot of the active window with a background to the correct size but the window the same size as original, instead of proportionally changing the active window size.) * The reason: completely broken functionality to keep all the GUI controls in sync with the saved settings and Preview image state. Issue occurred while upgrading snapshot/social media floater (changeset (1acc14a5e7ac) New snapshot/social media floater) * Fix: added disabling of floater's buttons depend on snapshot is up to date ("Share Snapshot", "Save Snapshot", "Set As Profile Pic", "Share To Web", "Email Snapshot", "Save To My Inventory", "Save To My Computer"). QA Note: other controls should be checked against necessity to disable them while changing snapshot settings. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/181/ --HG-- branch : product-engine