summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-22merge changes for STORM-1915Oz Linden
2014-04-22merge changes for STORM-2023Oz Linden
2014-04-22MergeXiaohong Bao
2014-04-22merge up to 3.7.6-releaseOz Linden
2014-04-22add Cinder Roxley to contributors for STORM-1831Oz Linden
2014-04-22Modify importer to (optionally) improve debug output, perform name-based LOD ↵Graham Linden
association, and handle models with many materials.
2014-04-22mergeBrad Payne (Vir Linden)
2014-04-21Merge downstream codesimon
2014-04-21Pull and merge DRTVWR-364simon
2014-04-21merge changes for 3.7.6-releaseOz Linden
2014-04-21Merge downstream codesimon
2014-04-21Merge downstream code updating version to 3.7.7simon
2014-04-21increment viewer version to 3.7.7Oz Linden
2014-04-21Added tag 3.7.6-release for changeset d029faf69f20Oz Linden
2014-04-21Another oops windows build fix.Cinder
2014-04-21Windows build fix.Cinder
2014-04-18Reinstate support text appendText() in LLFloaterAboutCinder
2014-04-18Remove clearHighlights()Cinder
2014-04-18Move some more script editor functions from LLTextEditor to LLScriptEditorCinder
2014-04-18Fix header guardCinder
2014-04-18Remove calls to now unused methodsCinder Biscuits
2014-04-18STORM-2023: Restore system color picker on OSXCinder Biscuits
2014-04-18Trivial typo fixCinder
2014-04-18Begin moving script editor portions of LLTextEditor to their own derived class.Cinder
This should fix the run off segment bugs by not overriding LLTextBase::clearSegments() in LLTextEditor TODO: Move the rest of the script stuff out of LLTextEditor for simplicity sake
2014-04-16Undo of overzealous removal.Aura Linden
2014-04-16Orphaned definitionCinder
2014-04-16bool not U32Cinder
2014-04-15Linux/Win: Bad checksum on Windows package. Libz and libpng linking ↵Monty Brandenberg
changes to find newest code. Windows autobuild package had a bad checksum due to oddities in the build system. On Linux I've been fighting with getting libz 1.2.8 and libpng 1.6.8 to be the definitive version in the viewer. Problem is the *massive* library search tree we assemble. We find older shared library versions first and so those dominated. By using --whole-archive with static libraries, the packaged versions of these libraries are made definitive.
2014-04-15maint-5707 window should no longer be displayed.Aura Linden
2014-04-15Disabled 'Sending to server Try N' messages from crash reporting.Aura Linden
2014-04-15Merges in fix for Maint-5707Aura Linden
2014-04-14Fix for MAINT-5707 bad breakpad behavior with teleport linksAura Linden
2014-04-14All/Mac: Update libraries to new template builds. Package for static ↵Monty Brandenberg
libz/libpng/openssl. Update library dependencies to reference builds using new templates and modern build hosts for: SDL, c-ares, boost, curl, libpng, llqtwebkit2, openssl and zlib. Update manifest, library copying and 'test_apps' setup to reflect that zlib and openssl are now always static (on Mac and Linux). Viewer and test_apps now functional on 10.7 Mac.
2014-04-11Mac: Update llqtwebkit build, build and package dylib Qt4 pieces.Monty Brandenberg
Part of the switchover to dynamic Qt4. This mostly completes the Mac side. Webkit is functional on Mac, plugins work. The two test programs, llfbconnectest and llplugintest, need a little more work to run without manual fixup ('.' on PATH and maybe a symlink to libz.1.dylib and they run and function on Mac). Also need to address libz.dylib vs libz.a. Currently resolving against dylib which is not what I want.
2014-04-11MAINT-3698 Typo is fixedmaxim@mnikolenko
2014-04-11MAINT-3698 Typo is fixedmaxim@mnikolenko
2014-04-10MAINT-4133 FIXED Import llpanelgroupinvite.cpp from viewer_lion to ↵andreylproductengine
voorhees_groupban: import of changes for MAINT-3846.
2014-06-10Import llpanelgroupinvite from viewer_lionmaksymsproductengine
2014-06-06MAINT-3389 FIXED [vwr] No visual feedback if you try to ban an already ↵maksymsproductengine
banned agent.
2014-06-04MAINT-3386 FIXED [vwr] Banned Agents list does not show newly-banned residentsandreykproductengine
2014-05-29MAINT-3351 FIXED Misleading failure message when user is successfully ↵maksymsproductengine
removed from a group's Owners role
2014-04-28MAINT-3957 FIXED Group owner issueMnikolenko ProductEngine
2014-04-09Merge downstream codesimon
2014-04-09MAINT-2034 : Terrain texture changes caused by changing texture elevationsimon
ranges or terraforming can not be seen until after relog or teleporting out and back to the region
2014-04-09All/Linux: Update llqtwebkit to latest all-shared lib build. Linux packageMonty Brandenberg
assembly updated to deal with Qt libraries and discrete codec and imageformat plugins (which live under bin/llplugin). Functioning Linux viewer with MoaP support with a few image problems (sRGB profile, zlib errors). Much of this expected to be due to the new 1.6.8/1.2.8 libpng/libz and we'll fix as needed.
2014-04-09MAINT-3903 FIXED Instant message toasts and certain kinds of popups (ex. ↵maksymsproductengine
group invites) fail to display if an offline inventory offer was received before logging in: Backed out changeset: f7234f8fdce8: MAINT-3536 new crash in XML_ParserFree.
2014-04-08revived some deleted files to get mac build workingRichard Linden
2014-04-08added SKIP_AUTORUN command line flag to disable automatically running viewer ↵Richard Linden
after install
2014-04-08mergeBrad Payne (Vir Linden)
2014-04-08merge changes for 3.7.5-releaseOz Linden