summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-04-07MergeLeyla Farazha
2010-04-07mergeRichard Linden
2010-04-07EXT-6693 - [crashhunters] crash in LLPopupView::handleMouseEventRichard Linden
2010-04-07EXT-5646 Replace the "More >>" chevron with the art we use for the Favorites ↵Leyla Farazha
bar overflow (TabIcon_Close_Off and TabIcon_Close_Over). cc # 179
2010-04-07EXT-6308 Drag and Drop cursor indicates you can drop a URL on a Shared ↵Leyla Farazha
Media prim that you are not allowed to Navigate reviewd by Richard cc# 178
2010-04-07VWR-17781 en_xui_change for fixing truncation in multiple languages, esp. ↵Eli Linden
ES, IT, NL
2010-04-07fixes from automated mergeLoren Shih
2010-04-07automated mergeLoren Shih
2010-04-07EXT-6749 : Have all observers persist/retry when items are missing after ↵Loren Shih
notifications Added mNumTries and took out mRetryIfMissing
2010-04-07MergeEli Linden
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-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/ --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-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 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
2010-04-07mergeYuri Chebotarev
--HG-- branch : product-engine
2010-04-06EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a ↵Loren Shih
base abstract LLInventoryFetchObserver class Added a new abstract class LLInventoryFetchObserver from which LLInventoryFetchItems and LLInventoryFetchDescendents inherit. Also changed isEverythingComplete to isFinished and made some other minor superficial changes.
2010-04-06EXT-6727 : Allow LLInventoryObservers to target a single item (instead of a ↵Loren Shih
vector of items) Added new constructors to LLInventoryFetch types to allow passing in a single item.
2010-04-06ES linguisticEli Linden
2010-04-06EXT-4151 : Immediately check if a fetchObserver filter is done, else add to ↵Loren Shih
observer list automatically FetchObservers now take in a list of IDs to check against. Made some naming changes.
2010-04-06merge from viewer-2-0Tofu Linden
2010-04-06Resurrect 'Sun' menu options.Tofu Linden
These seem to have been clobbered by some bad XML merging that probably came in with 73f60e5518af / EXT-3531
2010-04-06Fixed major bug EXT-6718 (Top menu: 'Build' and 'Help' items are absent).Vadim Savchuk
Restoring comment end marker, accidentally removed in changeset 73f60e5518af. Trivial change, not reviewed. --HG-- branch : product-engine
2010-04-06Fixed major bug EXT-6572 (EXT-6572 ([VARIABLE IN WRONG PLACE] in Taskbar ↵Paul Guslisty
\"Kaufen L$\" should be \"L$ kaufen\") - Removed the L$ graphic and made \"L$\" part of the label string. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/172/ (transplanted from 4cbdcfc8b196f0ff28df1d0897023ee967cce2a3)
2010-04-16MergeRichard Linden