summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-02Manual cleanup from merge up to viewer-development.Nat Goodspeed
Some viewer-development code had been moved, and so wasn't patched with my panel_login layout changes; verified each of my llpanellogin.cpp commits against new tip rev. Reformatted panel_login.xml in the spirit of the preferred indentation scheme but with my layout changes.
2012-08-02Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-08-02tag merge of DRTVWR-186Oz Linden
2012-08-02MAINT-515 FIX, CHOP-100 FIX - technically we are avoiding these issues ↵Brad Payne (Vir Linden)
rather than fixing them; changing llcommon to be statically linked avoids the symbol issues with llcommon.dll
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 ↵prep@lindenlab.com
cancel), the pathing console rebuilds the gfx data.
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
(259197) Beta in "Add scroll list item" removed linear scan for namelist items and used weak reference (LLHandle) instead
2012-07-27increment version to 3.4.1Oz Linden
2012-07-27Added tag 3.4.0-beta1 for changeset 1f27cdfdc542Oz Linden
2012-07-26Merge viewer-development -> viewer-horde-fixesDon Kjer
2012-07-25another change to force a new ticket, disable some codeticket featuresOz Linden
2012-07-25clean up BuildParams and change to force a new ticketOz Linden
2012-07-25increment version to 3.4.0Oz Linden
2012-07-25SH-3258 WIP Adding new switching of new vs old appearance based on ↵Nyx (Neal Orman)
appearance message Not all appearance messages on a region will be new or old style at all times. Thus we're using a specific flag to mark the new appearance messages.
2012-07-25tag merge of DRTVWR-182Oz Linden
2012-07-25pull latest pathfinding changes from integration branchOz Linden
2012-07-25update to latest builds of llphysicsextensionssOz Linden
2012-07-24Adding a group identifier to the group objects in the pathfinding linksets ↵Todd Stinson
and characters floaters.
2012-07-24merge up to latest viewer-pathfinding (including 3.3.4)Oz Linden
2012-07-24merge to viewer-developmentoOz Linden
2012-07-24Engage dormant first-login-this-install popup message.Nat Goodspeed
Although the XUI for this popup, and the code to display and respond to it, have been present from the first rev in the current viewer repository, I can find no trace of it ever having been called. Reword embedded link in popup message in each supported language: directly mentioning secondlife.com in display text engages anti-URL-spoofing logic, causing the popup to display the whole messy URL with sourceid and lang params. Change to say "Second Life web site" instead -- needs translations.
2012-07-24In getUniqueID(), don't forget to reset formatting on log stream.Nat Goodspeed
Otherwise later log fields start showing up with zero fill, etc.
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 ↵Xiaohong Bao
texture fetching queue ONLY once during a teleporting.
2012-07-23Fix LLMachineID::getUniqueID() LL_DEBUGS log output.Nat Goodspeed
getUniqueID() was logging six somewhat random bytes as garbage characters. Change to produce a hex string instead.
2012-07-23pull back 3.3.4 release tagOz Linden
2012-07-23Added tag 3.3.4-release for changeset 28e100d0379aOz Linden
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 ↵Oz Linden
LL_DEBUG_HAVOK is used
2012-07-20refactor to build llphysicsextensions_tpv package for sublicenseesOz Linden