summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-08MergeEli Linden
2010-03-08ES linguistic changesEli Linden
2010-03-08beta 4 tier1 JA translation, new fileEli Linden
2010-03-08beta 4 tier1 JA translationEli Linden
2010-03-08VWR-17477 en_xui_changeEli Linden
2010-03-08WR-17933 en_xui_change; undid 'de' evil overrides. also, more fix for 'en' ↵Eli Linden
floater_tools build menu
2010-03-08Fix for mac build errorMonroe Linden
"enumeration value 'MEDIA_EVENT_CLICK_LINK_NOFOLLOW' not handled in switch"
2010-03-08EXT-6266 en_xui_change for spinner label widths; undid 'de' local overridesEli Linden
2010-03-08Local mergeskolb
2010-03-08https://jira.secondlife.com/browse/EXT-5884skolb
Added code to support SLAPPS for Media on a Prim Reviewed by Monroe and Callum via Code Collab (Review 143).
2010-03-08EXT-5867 : Crash when clicking and dragging root folder of object contents ↵Loren Shih
into build floater Simple fix to use dynamic cast - the previous unsafe static cast was treating folders as if they were items and then querying permissions, which don't exist for folders. This code actually existed back in 1.23 but by some stroke of luck worked.
2010-03-08EXT-6256 - Viewer 2 - Search field set the focus out of the field when user ↵Richard Nelson
type 'ne' or 'na' or some other letters combinations reviewed by Leyla
2010-03-08MergeEli Linden
2010-03-08VWR-17615 en_xui_change; undoing bad local overrides in fr and esEli Linden
2010-03-08mergeRichard Nelson
2010-03-08better fix for spam in LLTextureViewRichard Nelson
reviewed by Palmer
2010-03-08Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2010-03-08MergeEli Linden
2010-03-08linguistic fixesEli Linden
2010-03-08Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2010-03-08Fix breaking indra/test/llpermissions_tut.cpp tests.Nat Goodspeed
Certain tests of allowModifyBy(), allowCopyBy() and allowMoveBy() were computing a bit-shifted S32 value and testing that the method return value matched that specific bit. Whoever originally coded the test probably started with allowModifyBy() == TRUE, but observed that it didn't work. Instead of just testing for nonzero, in the spirit of BOOL, he then determined the specific BOOL value (typedef for 'int') returned by each test so he could still compare for equality. In other words, the tests were far too knowledgeable about the method implementation. At some point these methods were changed to return C++ standard 'bool' instead, so the internal bit-masking operations got mapped to 'true' and 'false' anyway, making it impossible for the original equality comparison to succeed. Fix tests accordingly. Use ensure_equals("msg", expr1, expr2) instead of ensure("msg", expr1 == expr2). On failure, the former will report the actual mismatched values. Remove other extraneous Microsoft-style "BOOL" usage (e.g. expr == TRUE).
2010-03-08Remove a '#error XXX' I was using to test ifdef-hell.Tofu Linden
2010-03-08VWR-4214 followupTofu Linden
Make the fix work for alpha masks ('fast alpha') too - ironically this hasn't ever worked either AFAICT.
2010-03-08fixes VWR-4214 Glow effect passes through alpha textures where alpha is ↵Tofu Linden
actually "solid" and its many many dupes. In summary this does the following: * When laying down alpha, uses the new separated color-and-alpha blend func support to suppress existing glow in proportion to the opacity of the incoming fragments * Moves glowing-alpha support from the glow pool to the alpha pool, ensures that the glow pass for a vertex buffer happens after the alpha pass for the vertex buffer so that it doesn't suppress its *own* glow. Tested with all shader modes, FBO on/off, and deferred rendering. Tested with every permutation of alpha/non-alpha/glow/non-glow/fullbright/waterglow/particle interaction I could contrive so far. :)
2010-03-08mergeTofu Linden
2010-03-08EXT-2418 Object hover tips no longer show price, description or ownerangela
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-07Add support for glBlendFuncSeparate().Tofu Linden
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
2010-03-07PE merge.Tofu Linden
2010-03-07Add a touch of fakey ripple to shadows on the surface of water, as if the ↵Tofu Linden
water has depth. Using 4th component of the normal map to encode a position displacement (along the normal) in the class2 shadow lookup.
2010-03-07Some extra comments to help me get things straight.Tofu Linden
2010-03-07trivial comment typo fix.Tofu Linden
2010-03-07Remove an extraneous normalize() from the water fragment shader - the last ↵Tofu Linden
thing we did to this vector was normalize it anyway.
2010-03-07Remove the class2/class3 water shaders, which aren't materially different ↵Tofu Linden
from class1 except for some minor const tweaks (I've migrated class3's tweaks into class1 on the assumption that this was what davep sees all the time)
2010-03-06viewer2 merge.Tofu Linden
2010-03-06Better bounding boxes for meshes.Dave Parks
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-06Implemented (EXT-4715) Add maturity icons to Classifieds - create and details.Sergei Litovchuk
--HG-- branch : product-engine