summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-11-26merge changes for DRTVWR-249Oz Linden
2012-11-21more for SH-3571: display frame-to-frame pixel differences on screenXiaohong Bao
2012-11-20more for SH-3352: Create pixel shader to accumulate frame-to-frame absolute ↵Xiaohong Bao
pixel differences
2012-11-20fix a crash caused by object cache for SH-3333.Xiaohong Bao
2012-11-20SH-3406 WIP convert fast timers to lltrace systemRichard Linden
fixes to merge
2012-11-20merge changes for DRTVWR-247Oz Linden
2012-11-20Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-20merge changes for DRTVWR-229Oz Linden
2012-11-19for SH-3561: capture the frame buffer contents and compare pixel differences ↵Xiaohong Bao
between frames.
2012-11-19for SH-3352: Create pixel shader to accumulate frame-to-frame absolute pixel ↵Xiaohong Bao
differences
2012-11-19merge with viewer-developmentRichard Linden
2012-11-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-19Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-19increment version to 3.4.4Oz Linden
2012-11-19Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-19merge changes for DRTVWR-245Oz Linden
2012-11-16SH-3406 WIP convert fast timers to lltrace systemRichard Linden
got new fast timer code to compile and run
2012-11-16MAINT-1890 FIX Removing previous hacky fix for this issue. The better ↵William Todd Stinson
solution is to clamp the update_period to a reasonable number of frames (32).
2012-11-16Some Mac header #defines macros like check and equivalent -- gack!!Nat Goodspeed
Given that third-party libraries (such as Boost) can and do use those names, properly namespace-scoped, it's unpardonable to break any such innocent usage with a macro. Given the pervasiveness of the need, introduce a header file with the requisite #undef directives.
2012-11-16Certain test and example programs now need the Boost.System library.Nat Goodspeed
2012-11-16Boost 1.52 no longer supports Boost.Filesystem v2 -- don't request.Nat Goodspeed
Instead of compatibility mode, #defining BOOST_FILESYSTEM_VERSION to 2 only gets you a compile error these days.
2012-11-16Remove sensitivity to Boost library versions in viewer_manifest.py.Nat Goodspeed
2012-11-16Fix Boost shared-library version suffixes in Copy3rdPartyLibs.cmake.Nat Goodspeed
2012-11-16Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-15SH-3406 WIP convert fast timers to lltrace systemRichard Linden
eliminated min and max macros from windows.h got rest of viewer to compile against llfasttimer changes
2012-11-15Remove Boost version "1_45" baked into library names.Nat Goodspeed
On Windows, LLPrimitive.cmake named four Boost libraries with names ending in the string 1_45. Now that we're trying to upgrade Boost to 1.52, those suffixes are inappropriate. Fortunately the libraries in our current Boost package do not have version-stamped names, so we hope this fix can survive for several Boost upgrades to come.
2012-11-14SH-3406 WIP convert fast timers to lltrace systemRichard Linden
cleaning up build moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc streamlined Time class and consolidated functionality in BlockTimer class llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14DRTVWR-241: resolve merge conflict with viewer-development.Nat Goodspeed
LLUI::setupPaths() went away with DRTVWR-210.
2012-11-14Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-14merge changes for 3.4.2-beta4Oz Linden
2012-11-13DRTVWR-210: sanitize ampersand embedded in strings.xml messagesNat Goodspeed
2012-11-13SH-3406 WIP convert fast timers to lltrace systemRichard Linden
moving fast timers into lltrace namespace and accumulation system
2012-11-13Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-13Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-13Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-13MAINT-1890: Adding a more descriptive comment to this hack fix for future ↵William Todd Stinson
reference.
2012-11-13MAINT-1891: FIX Updating the LLPipeline::clearRebuildGroups() to preserve ↵William Todd Stinson
HUD groups. clearRebuildGroups() is called during the teleport process. In the previous state, HUD objects were being incorrectly removed from the rebuild groups during the teleport process. This change will preserve HUD groups and should resolve this issue.
2012-11-13Stupid typo in Boost Cmake filecallum_linden
2012-11-13Update Windows lib names for new Boost packagecallum_linden
2012-11-13merge changes for DRTVWR-238Oz Linden
2012-11-13merge changes for DRTVWR-209Oz Linden
2012-11-12MAINT-1890: A hacky fix for flexi-prim updates after teleport by ignoring ↵William Todd Stinson
the sUpdateDelay value and simply updating all flexi-prims. This change most likely reduces frame rate.
2012-11-12SH-3406 WIP convert fast timers to lltrace systemRichard Linden
removed remnants of LLFastTimer::FrameState
2012-11-12SH-3406 WIP convert fast timers to lltrace systemRichard Linden
simplified llfasttimer code down to 2 classes llunit unit conversion now done in floating point or 64 bit integer precision, depending on source type
2012-11-12Ported slplugin and some other missing components for cocoa.Aura Linden
2012-11-12First round of fixes to make viewer work with Boost 1.52callum_linden
2012-11-12Pulled cocoa crash reporter changes from old branch.Aura Linden
2012-11-12Removed old nib to make way for the new.Aura Linden
2012-11-12Mac updater changes ported from another branch.Aura Linden