summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-03-09fix for EXT-4161: skinny pant legs(have no flare)Xiaohong Bao
2010-03-07trival fix to eliminate unnecessary warnings "LLView::~LLView(): Deleting ↵Xiaohong Bao
view " << mName << " during UI draw() phase" caused in lltextureview.cpp (from the texture console).
2010-03-07Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Xiaohong Bao
2010-03-07partial fix for EXT-5711: Some textures loading from cache seems jammed.Xiaohong Bao
This fix should be able to improve the speed of loading texturs from cache noticeably (30% or more). More fix to come.
2010-03-05mergeRichard Linden
2010-03-05fixRichard Linden
2010-03-05Fix for a crash on startup/shutdown introduced in the tip of viewer-2-0 very ↵Monroe Linden
recently. list.erase(list.find()) is not safe, because erasing list.end() is undefined. Check to make sure the find succeeded before doing the erase. Reviewed by Richard at http://codereview.lindenlab.com/341001
2010-03-05mergeRichard Linden
2010-03-05added some logging to help track down crash in EXT-5849Richard Linden
2010-03-05MergeEli Linden
2010-03-05VWR-17723Eli Linden
2010-03-05VWR-17121 en_xui_changeEli Linden
2010-03-05mergeRichard Linden
2010-03-05fix for mergeRichard Linden
2010-03-05VWR-17116 en_xui_changeEli Linden
2010-03-05mergeRichard Linden
2010-03-05MergeEli Linden
2010-03-05VWR-17558 en_xui_changeEli Linden
2010-03-05VWR-17687 en_xui_changeEli Linden
2010-03-05VWR-17686Eli Linden
2010-03-05VWR-17362Eli Linden
2010-03-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2010-03-05Fix Mac llmediaplugintest build breakage.Nat Goodspeed
A viewport array passed to glGetIntegerv() and gluUnProject() was declared as 'int'. This compiles on Windows, but fails on Mac. Declaring as 'GLint' works.
2010-03-05mergePalmer
2010-03-05Only comments added to crash reporting code on handling old crash logs on ↵Palmer
mac. No code changed :)
2010-03-05EXT-5698 undo local FR override (not good practice); fix EN instead for ↵Eli Linden
consistency, and to allow for ES longer translation of "Buy" (Erica changed "Buy L$" to "Buy" to mitigate the problem)
2010-03-05MergeEli Linden
2010-03-05beta 4 JA linguisticEli Linden
2010-03-05merge.Tofu Linden
2010-03-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-03-05PE merge.Tofu Linden
2010-03-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Xiaohong Bao
2010-03-05mergeVadim Savchuk
--HG-- branch : product-engine
2010-03-05Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-03-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-03-05EXT-5847 failure to bake when standard wearables are generatedNyx (Neal Orman)
Standard wearables have no textures associated with them. No textures means no texture callbacks. Fixed the issue by requesting a texture upload on baked textures that we don't get a cahced baked texture response for. This clears up the repro Code reviewed by prep, vir
2010-03-05merge.Tofu Linden
2010-03-05Backed out changeset ede35a3eda50 - restore EXT-5891Tofu Linden
The specs contradict themselves and I *like* this interpretation better.
2010-03-05Update for major bug EXT-5943 - Classifieds are Published and charged as ↵Dmitry Zaporozhan
soon as you hit Save. Fixed category mismatch after editing classified. Made price uneditable in edit mode because it looks like server does not support price update(same in viewer 1.23) --HG-- branch : product-engine
2010-03-05Implemented (EXT-4705) Show maturity icon on Region/Estate tab.Sergei Litovchuk
- Added LLIconsComboBox class - a combobox with icons for maturity ratings. - Fixed scroll list maximum width calculation. The width was calculated based on text value width for non-text columns. - Added image overlay alignment getter method to LLButton. --HG-- branch : product-engine
2010-03-05Fixed (EXT-4704) Add maturity icons to Prefs -> General.Sergei Litovchuk
- Added icons updating upon opening Prefs -> General panel. --HG-- branch : product-engine
2010-03-05mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-03-05PE merge.Tofu Linden
2010-03-05fix for normal EXT-1888 Apply button remains active after Applying changesYchebotarev ProductEngine
--HG-- branch : product-engine
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