summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-03-08automated mergeRoxie Linden
2010-03-08DEV-45976 Last Login Location Preference not rememberedRoxie 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-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-08mergeTofu Linden
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-07PE merge.Tofu Linden
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
2010-03-06Fixed major bug (EXT-6033) Parcel, Region,and Estate areas of 'PlaceProfile' ↵Sergei Litovchuk
are corrupted. - Added height attribute value to accordion tabs. --HG-- branch : product-engine
2010-03-06(EXT-4705) Show maturity icon on Region/Estate tabSergei Litovchuk
- Added items names to match localized XUI. --HG-- branch : product-engine
2010-03-05mergeRichard Linden
2010-03-05MergeEli Linden
2010-03-06Fixed linux buildAndrew Dyukov
--HG-- branch : product-engine
2010-03-06Partially implemented nice-to have sub-task EXT-4706 (Add maturity icons to ↵Andrew Dyukov
About Land). - Added maturity icons to General and Covenant tabs. --HG-- branch : product-engine
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-05Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - ↵Eugene Mutavchi
implemented LLWindowMacOSX::maximize() method --HG-- branch : product-engine
2010-03-05Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - ↵Eugene Mutavchi
implemented LLWindowSDL::maximize() method --HG-- branch : product-engine
2010-03-05Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - moved ↵Eugene Mutavchi
LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux. --HG-- branch : product-engine
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 22:05:44 +0000