summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-05-18merge latest updates from viewer-developmentOz Linden
2011-05-18merge changes for storm-941Oz Linden
2011-05-18merge changes for storm-1175Oz Linden
2011-05-18merge changes for storm-1032Oz Linden
2011-05-18merge changes for storm-1259Oz Linden
2011-05-18merge up latest viewer-development (post mesh)Oz Linden
2011-05-17merge notifications.xml fixOz Linden
2011-05-17fix merge error in open source configurations to disable proprietary componentsOz Linden
2011-05-17remove junk from after close tagOz Linden
2011-05-17Merge cleanupDave Parks
2011-05-17pull back fix for STORM-1260 from beta branchOz Linden
2011-05-17BUILDFIX: copy/paste error in mesh autobuild.xml causes configure to fail.Nyx (Neal Orman)
copy/paste error in autobuild.xml caused INSTALL_PROPRIETARY to be set to TRUE for OS builds. This causes configure to fail as llconvexdecomposition is not available to OS devs. Changing INSTALL_PROPRIETARY to false for OS devs so that llconvexdecompositionstub is used instead. problem only affects windows builds.
2011-05-17un-hardcode the viewer name merged in from the mesh branchOz Linden
2011-05-17Undo installer text changeeli_linden
2011-05-17STORM-1260 FIXED Replaced llerrs messages with llwarns in directory iterator ↵seth_productengine
code to avoid viewer halt when a cache dir is not found.
2011-05-17Restore reference to $last_built_variant when computing path to the Windows ↵CG Linden
Installer
2011-05-17STORM-1032 FIXED Artwork update for Appearance Editor "Edit" iconPaul ProductEngine
- Replaced old edit icon with the new one
2011-05-16VWR-22299 Error strings for login failure conditionsJoshua Bell
2011-05-16mergeDave Parks
2011-05-16STORM-1259 Sculpt dimension meta-data view missing from 2.x, was possible to ↵Jonathan Yap
see in 1.23
2011-05-16Added tag 2.6.9-start for changeset e67da2c6e312Oz Linden
2011-05-16remove new search in favor of moving to a project viewerOz Linden
2011-05-16Added tag 2.6.9-start for changeset 11d5d8080e67Oz Linden
2011-05-16Merge cleanup.Dave Parks
2011-05-16mergeDave Parks
2011-05-16MergeJoshua Bell
2011-05-16WIP viewer side of ER-864: comment changeJoshua Bell
2011-05-15STORM-859 : Replacing winres.h with windows.h so that the viewer will build ↵Wolfpup Lowenhar
with-out having to copy any files to the source tree when useing express versions of Visual Studio.
2011-05-15storm-1249 and chop-661Oz Linden
2011-05-14reverting test change. pls ignoreeli_linden
2011-05-14test please ignoreeli_linden
2011-05-13Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-05-13WIP INTL-46 update windows installer text for Traditional ChineseEli Linden
2011-05-13sync with viewer-developmentEli Linden
2011-05-13FIX VWR-24935 es linguistic patchEli Linden
2011-05-13sync up with viewer-developmentEli Linden
2011-05-13EXP-783 User can accept a call and see end call option in IM window but they ↵Leyla Farazha
are in nearby voice
2011-05-13merge up to latest viewer-developmentOz Linden
2011-05-13storm-1100: merged many more updates and refinements to table, added tester ↵Oz Linden
and files to test with
2011-05-13Fixed more build breakages due to persnickety compilers on mac/linuxBrad Payne (Vir Linden)
2011-05-13removed some XML loggingBrad Payne (Vir Linden)
2011-05-13mergeBrad Payne (Vir Linden)
2011-05-12EXP-818 FIX Use different settings to control search url for beta channel ↵Richard Linden
viewers
2011-05-12WIP VWR-23688 adding es and pt missing translation; add 1 zh file for ↵Eli Linden
testing Traditional Chinese as a new language
2011-05-12sync up with viewer-developmentEli Linden
2011-05-12mergeDave Parks
2011-05-12Fix up alignment problems for debug build.brad kittenbrink
reviewed by davep.
2011-05-12Fix for error in debug build accessing beyond the end of a vector.brad kittenbrink
reviewed by davep.
2011-05-12mergeDave Parks
2011-05-12mergeBrad Payne (Vir Linden)