summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2012-08-14Automated merge with https://bitbucket.org/VirLinden/sunshineNyx (Neal Orman)
2012-08-14SH-3310 WIP setting up architecture for switching texture baking on per-regio...Nyx (Neal Orman)
2012-08-08mergeBrad Payne (Vir Linden)
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-03Added viewer param for appearance message versionBrad Payne (Vir Linden)
2012-08-03Merge with lindenlab/viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-02Merge viewer-horde-fixes -> sunshineDon Kjer
2012-08-02mergeBrad Payne (Vir Linden)
2012-08-02mergeBrad Payne (Vir Linden)
2012-08-02Added AppearanceData block to AvatarAppearance messageDon Kjer
2012-08-02Merge viewer-development -> viewer-horde-fixesDon Kjer
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-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30line munging for merge warn-on-failure:unix-eolBrad Payne (Vir Linden)
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-27increment version to 3.4.1Oz Linden
2012-07-26Merge viewer-development -> viewer-horde-fixesDon Kjer
2012-07-25increment version to 3.4.0Oz Linden
2012-07-25SH-3258 WIP Adding new switching of new vs old appearance based on appearance...Nyx (Neal Orman)
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 up to latest viewer-pathfinding (including 3.3.4)Oz Linden
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-23a trivial code change for SH-3073. The change makes sure to clear the textur...Xiaohong Bao
2012-07-23Fix for path-826. Safeguarding against a mull weight being usedprep
2012-07-21fix finding havok libs in relwithdebinfo mode (uses release unless LL_DEBUG_H...Oz Linden
2012-07-20refactor to build llphysicsextensions_tpv package for sublicenseesOz Linden
2012-07-19fix for SH-3238: Textures are loaded at lower detail on subsequent log-insXiaohong Bao
2012-07-19MAINT-1175: Use workaround for comparing std::type_info* on gcc < 4.4.Nat Goodspeed
2012-07-18MAINT-1175: Ditch LLTypeInfoLookup, make map<const type_info*> work.Nat Goodspeed
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-18MAINT-1175: merge backout LLRegistrySingleton<std::type_info::name()>Nat Goodspeed
2012-07-18Backed out changeset a25bfa87418d (using std::type_info::name())Nat Goodspeed