summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-07-20SH-2021 Fix for black water at the horizon from occlusion culling madness.Dave Parks
2011-07-20mergeLeyla Farazha
2011-07-20EXP-937 JavaScript can be turned off in the viewer which will break intro ↵Leyla Farazha
screen - investigate options
2011-07-20SH-1838 Add error handling for allocation of off screen render targets.Dave Parks
Reviewed by Leslie
2011-07-20FIX INTL-58 set25, light set4 translation for 6 languageseli
2011-07-20Removed unused variable for build fix.Leslie Linden
2011-07-20still trying to fix channelsBrad Payne (Vir Linden)
2011-07-20Disabling freshness tag for the merge.Leslie Linden
2011-07-19mergeLeyla Farazha
2011-07-19EXP-932 Implement system that fades from login page to (either) intro screen ↵Leyla Farazha
or loading screen instead of using a hard cut EXP-938 Turn off in-world audio until fade from intro/loading page complete EXP-939 Fade from intro/loading page to world, not to image of last login
2011-07-19SH-2090 FIX - cherry pick from davep commitBrad Payne (Vir Linden)
2011-07-19SH-2038 FIX -- [PUBLIC] Severe performance drop on MacBook ProsLeslie Linden
EXP-997 FIX -- Significant FPS degradation in 2.8.0 Beta on Mac equipped ATI video card * Disabled VBO's on mac to avoid stalls in renderer * Placed valid data into the padding between triangles in the vertex buffer to remove uninitialized craziness * Removed invalid rendering checks causing GL errors in debug mode Reviewed by davep
2011-07-19merge changes for storm-1487Oz Linden
2011-07-19merge changes for storm-1221Oz Linden
2011-07-19merge changes for storm-1502Oz Linden
2011-07-19merge changes for storm-1503Oz Linden
2011-07-19merge changes for vwr-26066Oz Linden
2011-07-19merge changes for storm-1476Oz Linden
2011-07-19addendum to prim fixBrad Payne (Vir Linden)
2011-07-19Cherry pick of ↵Brad Payne (Vir Linden)
https://bitbucket.org/lindenlab/mesh-development/changeset/9cea44ebea3b by don, to fix old viewer crashes in mesh regions
2011-07-19STORM-519 FIXED "Delete" is enabled in the context menu for folders which ↵Paul ProductEngine
contain worn items - Disable "Delete" menu item in case selected folder contains non-removable items.
2011-07-19STORM-1487 FIXED Changed the "get more gestures" marketplace URL.Vadim ProductEngine
2011-07-19STORM-1221 FIXED Hard coded dates made localizable under Group Profile ↵Seth ProductEngine
Land/Assets. Added a function for parsing a date string of specific format. Added strings defining the date format in Group Profile Land/Assets that should be localized.
2011-07-19More FormatMessage compile errors, try again to fixNat Goodspeed
2011-07-19Fix copy/paste error in swiped FormatMessage() example code.Nat Goodspeed
2011-07-19mergeBrad Payne (Vir Linden)
2011-07-19Per Josh's comments in http://codereview.lindenlab.com/6510035/Nat Goodspeed
Instead of low-level open(O_CREAT | O_EXCL) loop on all platforms, use GetTempFileName() on Windows and mkstemp() elsewhere. Don't append a final newline to NamedTempFile: use caller's data literally. Tweak a couple comments.
2011-07-18SH-1904 FIX (cherry pick from original by bao)Brad Payne (Vir Linden)
2011-07-18sync with viewer-developmenteli
2011-07-18merge changes for storm-1515Oz Linden
2011-07-18merge changes for storm-1517Oz Linden
2011-07-18merge changes for storm-1516Oz Linden
2011-07-18merge changes for storm-1510Oz Linden
2011-07-18sync with viewer-developmenteli
2011-07-18SH-2031 Fix for shadow render targets using inappropriate shader for ↵Dave Parks
occlusion culling resulting in objects popping in and out of the shadow map.
2011-07-18merge changes for storm-1510Oz Linden
2011-07-18SH-2031 Fix for link error in llui_libtestDave Parks
2011-07-18increment viewer version to 2.8.2Oz Linden
2011-07-18re-enable the watchdogOz Linden
2011-07-17Decided against using Boost.Filesystem, remove from linkNat Goodspeed
2011-07-17SH-2031 High risk changeset, but potentially high reward. Addresses frame ↵Dave Parks
stalls in renderer by never using the fixed function pipeline if shaders are available.
2011-07-16Use raw-string syntax for other Windows pathnames inserted to Python.Nat Goodspeed
2011-07-16Use raw-string syntax for Python string containing Windows pathname.Nat Goodspeed
Consider this pathname for llsdserialize_test.cpp: C:\nats\indra\llcommon\tests\llsdserialize_test.cpp Embed that in a Python string literal: 'C:\nats\indra\llcommon\tests\llsdserialize_test.cpp' and you get a string containing: C: ats\indra\llcommon ests\llsdserialize_test.cpp where the \n became a newline and the \t became a tab character. Hopefully Python raw-string syntax r'C:\etc\etc' works better.
2011-07-16merge changes for storm-1482Oz Linden
2011-07-16merge late release changes and tagsOz Linden
2011-07-16pull back late beta fixOz Linden
2011-07-16Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15Use C++ __FILE__ rather than Python __file__ to find indra work area.Nat Goodspeed
In this case, the Python code in question is being written from a C++ string literal to a temp script file in a platform-dependent temp directory -- so the Python __file__ value tells you nothing about the location of the repository checkout. Embedding __FILE__ from the containing C++ source file works better.
2011-07-15Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15After review and testing, realized that 'WatchdogEnabled' is actually true ↵jenn
to its name, and is a boolean, not a timeout value. 'MainloopTimeoutDefault' is the actual timeout value. Updated descriptions and values accordingly to set Watchdog timeout to 60 seconds.