summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-03-05PE merge.Tofu Linden
2010-03-05Merged recent PE classified panel changes with LL fixes for EXT-5824, ↵Dmitry Zaporozhan
EXT-5860 and EXT-5859. --HG-- branch : product-engine
2010-03-05Updated LLPanelClassifiedInfo::resetData() with recentrly added controls.Dmitry Zaporozhan
--HG-- branch : product-engine
2010-03-05Update for normal sub task EXT-5856 - "Auto renew each week" checkbox is ↵Dmitry Zaporozhan
displayed in the Classified Info from other resident profile. Replaced auto_renew checkbox with textbox. --HG-- branch : product-engine
2010-03-05merge conflictsangela
2010-03-05 EXT-5698 Media/Play pause are trunkated in french floater.angela
2010-03-04beta 4 JA linguisticEli Linden
2010-03-04MergeEli Linden
2010-03-04CT-575 ES xlationEli Linden
2010-03-04Merge with tipCallum Prentice
2010-03-04Changes to plugin test app in preparation for work on positional per-process ↵Callum Prentice
audio for media. Not part of the client and nothing here is deployed - internal testing only.
2010-03-04Fix for EXT-5960 (Store media cookies per user rather than per viewer)Callum Prentice
Reviewed by RN and MW
2010-03-04EXT-2188 PL set5A xlation; 1 JA ling fixEli Linden
2010-03-04EXT-2188 PL set5A xlation; 1 JA ling fixEli Linden
2010-03-04beta 4 JA linguisticEli Linden
2010-03-04MergeEli Linden
2010-03-04CT-575 DA xlation, new filesEli Linden
2010-03-04CT-575 DA xlationEli Linden
2010-03-04automated merge viewer2.0->viewer2.0Loren Shih
2010-03-04EXT-5296 : Inventory folders revert to defort "sort" with each loginLoren Shih
Minor cleanup to start using DEFAULT_SORT_ORDER versus plain text "InventorySortOrder" in a few plaecs in the code. Makes this sorting code a lot easier to debug.
2010-03-04VWR-18007Eli Linden
2010-03-04Fix for EXT-5935Monroe Linden
Decrease PluginInstancesCPULimit default value from 1.0 to 0.9.
2010-03-04MergeEli Linden
2010-03-04MergeEli Linden
2010-03-04merge.Tofu Linden
2010-03-04EXT-5296 : Inventory folders revert to defort "sort" with each loginLoren Shih
Not my code, but ended up being a simple enough XML fix. Inventory sorting settings have changed in viewer2 from viewer1.23, this seems to be causing at least a couple of bugs. Fixed one, filing the other.
2010-03-04cycle6 DE JA xlation, new filesEli Linden
2010-03-04cycle6 DE JA xlation; beta 4 DE linguistic fixEli Linden
2010-03-04EXT-5919 Clean up fuzzy type in Buy L$Erica
2010-03-04PE merge.Tofu Linden
2010-03-04merge.Tofu Linden
2010-03-04EXT-5969 build and merge a shippable pixmap-based llqtwebkit for ↵Tofu Linden
viewer2.0/linux Maybe also: EXT-4495 flash content crashes Webkit on Linux
2010-03-04mergeMike Antipov
--HG-- branch : product-engine
2010-03-04Refixed Major bug EXT-3852 ([BSI] Tabs in Tabbed Instant Messaging do not ↵Mike Antipov
auto focus the text field when clicked) - set in floater_im_session.xml default tab groups over view hierarchy to have input field as a default widget. For now LLUICtrl::focusFirstItem called from Tab container gets input editor as "first item" & sets focus to it --HG-- branch : product-engine
2010-03-04ext-4657 changed inappropriate llerrs to llwarnsgabriel lee
reviewed by Lynx
2010-03-04mergeDmitry Zaporozhan
--HG-- branch : product-engine
2010-03-04mergeDmitry Zaporozhan
--HG-- branch : product-engine
2010-03-04Fixed Win build.Vadim Savchuk
--HG-- branch : product-engine
2010-03-04Fixed low bug EXT-5998 - Classified is scrolled if previos classified was ↵Dmitry Zaporozhan
scrolled. --HG-- branch : product-engine
2010-03-04mergeVadim Savchuk
--HG-- branch : product-engine
2010-03-04Add #if'd code that can deal with the newer QPixmap-based LLQtWebkits.Tofu Linden
Disabled for now.
2010-03-04Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-03-04Merge backed out revisionMike Antipov
--HG-- branch : product-engine
2010-03-04Backed out changeset: 0160afd678a5Mike Antipov
Implemented solution fixed bug caused by changes made for EXT-3852 (07f21c92896f & 07f21c92896f). For now previous changes for EXT-3852 are reverted. So, changes for EXT-4572 (Click and hold the left mouse button doesn't let you browse tabbed IM floater) are unnecessary. --HG-- branch : product-engine
2010-03-04Merge of reverted fix of EXT-3852Mike Antipov
--HG-- branch : product-engine
2010-03-04MergeMike Antipov
--HG-- branch : product-engine
2010-03-04Backed out changeset: 07f21c92896fMike Antipov
reverted fix for (EXT-3852 Tabs in Tabbed Instant Messaging do not auto focus the text field when clicked) Previously implemented solution conflicts with test case in EXT-5387. --HG-- branch : product-engine
2010-03-04Backed out changeset: 317082ea4701Mike Antipov
reverted fix for (EXT-3852 Tabs in Tabbed Instant Messaging do not auto focus the text field when clicked) Previously implemented solution conflicts with test case in EXT-5387. --HG-- branch : product-engine
2010-03-04Fixed major bug EXT-5943 - Classifieds are Published and charged as soon as ↵Dmitry Zaporozhan
you hit Save. Added Publish Classified floater to confirm classified creashion and publishing. --HG-- branch : product-engine
2010-03-04mergeYchebotarev ProductEngine
--HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 21:38:11 +0000