summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
2012-08-08merge changes for DRTVWR-189Oz Linden
2012-08-07merge changes for DRTVWR-188Oz Linden
2012-08-06PATH-842, VWR-29431: BUGFIX Correcting a regression introduced by the fix for...Todd Stinson
2012-08-03Merge with lindenlab/viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-01FIX INTL-100 Frrench linguistic fixeseli
2012-08-01sync with viewer-dev for 'fr'eli
2012-08-01sync with viewer-dev for 'ja'eli
2012-08-01sync with viewer-dev for changes and new files for 'en'eli
2012-08-01sync with viewer-dev, removing obsolete fileseli
2012-08-01Merge MAINT-1270 fixsimon@Simon-PC.lindenlab.com
2012-07-31Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-31Path-643. Once the preferences panel is closed (either through ok or cancel),...prep@lindenlab.com
2012-07-28Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-07-28Automated merge with ssh://hg.lindenlab.com/nat/viewer-maint-1175Nat Goodspeed
2012-07-27sync with viewer-releaseeli
2012-07-27MAINT-1175 FIX Severe performance issues on 3.3.2 (258114) Release and 3.3.3 ...Richard Linden
2012-07-25pull latest pathfinding changes from integration branchOz Linden
2012-07-24Adding a group identifier to the group objects in the pathfinding linksets an...Todd Stinson
2012-07-24merge to viewer-developmentoOz Linden
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-23PATH-781: Pulling in the new 'owner_is_group' field into the pathfinding object.Todd Stinson
2012-07-23Fix for path-826. Safeguarding against a mull weight being usedprep
2012-07-18Setting the description column of the linkset floater to be a fixed width. H...Todd Stinson
2012-07-18Updating the build tools floater to better handle multi-line creator and owne...Todd Stinson
2012-07-18Backed out changeset a25bfa87418d (using std::type_info::name())Nat Goodspeed
2012-07-18merge back fixes from 3.3.4-beta5Oz Linden
2012-07-17MAINT-1223 More aggressive rebuilding of render batches when alpha color valu...Dave Parks
2012-07-17pull back fixes for 3.3.4-beta4Oz Linden
2012-07-16MAINT-1270 Fix for some flexi prims becoming flat at some LoDsDave Parks
2012-07-16MAINT-1223 Fix for alpha updates not triggering LoD updates.Dave Parks
2012-07-16Path-814: Corrected shader fragment compilation error.prep
2012-07-14merge back beta fixes for DRTVWR-180Oz Linden
2012-07-13Disabling the phantom toggle when the object is volume-detect.Todd Stinson
2012-07-13Merge from lindenlab/viewmaster so we can get rid of itsimon@Simon-PC.lindenlab.com
2012-07-13merge changes for DRTVWR-179Oz Linden
2012-07-12Cleaning up some runtime output warning messages about invalid XUI syntax.Todd Stinson
2012-07-12Better optimization for loading avatar names that are already cached.Todd Stinson
2012-07-12MAINT-1262 Fix for crash when setting graphics to LowDave Parks
2012-07-12PATH-807: Ensuring that the "Show in linksets..." and "Show in characters..."...Todd Stinson
2012-07-12Removing debug settings that were in place for pathfinding simulator testing.Todd Stinson
2012-07-12PATH-807: Adding an additional check for if the object is marked as volume-de...Todd Stinson
2012-07-12merge MAINT-1253 fixOz Linden
2012-07-11Fix merge issues - duplicate insertions of codesimon@Simon-PC.lindenlab.com
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-07-11MAINT-1253 Rigged meshes in the upload model window now have a material appli...prep
2012-07-11MAINT-1175: Forbid LLRegistry[Singleton]<std::type_info*, ...>.Nat Goodspeed
2012-07-11Merging main havok-development-hkai and oz's havok-development-hkaiMatthew Breindel (Falcon)