summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-11-26merge fix for STORM-1984Oz Linden
2013-11-26remove excessively complex fixes for MAINT-2914 and MAINT-3142Oz Linden
2013-11-26ACME-3320 : Clearing deleted categories so not to pool on them foreverMerov Linden
2013-11-26STORM-1981 Eliminate beam spreadingJonathan Yap
2013-11-26MAINT-3489: Make Mac updater script detect prematurely deleted .dmg.Nat Goodspeed
Also, delete it when done.
2013-11-25MAINT-3320 : Make inbox (Received Items) more resilients to deletion while ↵Merov Linden
we're at it
2013-11-25remove obsolete INSTFLAGS references from installerOz Linden
2013-11-25Merge last changes for DRTVWR-345simon
2013-11-25STORM-1981 Make pulse operate properly in both directions.Jonathan Yap
Move duplicated common code into its own function.
2013-11-25mergeMaximB ProductEngine
2013-11-25MAINT-3499 FIXED Region Debug Console is broken after resizemaksymsproductengine
2013-11-25Merge. Refresh from viewer-release after 3.6.11 release.Monty Brandenberg
2013-11-25Merge - doh!simon
2013-11-24STORM-1981 Rough initial changes for evaluation purposes.Jonathan Yap
2013-11-24move setting default grid to settings_install.xml so that it works on all ↵Oz Linden
platforms
2013-11-24normalize format of and add arch to all installer namesOz Linden
2013-11-22fix for SH-4635: Interesting: Some objects do not load on the second visitXiaohong Bao
2013-11-22fix for SH-4632: Water over land doesn't render when teleporting to the same ↵Xiaohong Bao
place twice with location toolbar
2013-11-22ACME-1219 : Fix crash on exit on Windows 7merov
2013-11-22Merge server-releasesimon
2013-11-22MAINT-3474 FIXED crash on startup in LLTextureCache::purgeAllTextures(bool) ↵maksymsproductengine
attempting to delete texture cache
2013-11-22storm-1831 Replacing old hack with an ENUM check.Ima Mechanique
2013-11-21fix for SH-4633: Idle avatars intermittently vanish from the scene after ↵Xiaohong Bao
camming away, and returning to a location.
2013-11-21combine the visiblities of octree group and object cache entry for visiblity ↵Xiaohong Bao
check
2013-11-21fix a mouse hovering crash.Xiaohong Bao
2013-11-21Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-21fix for SH-4628: Project Interesting Viewer reduces & fixes graphics to ↵Xiaohong Bao
lowest settings on a MAC
2013-11-21storm-1831 Fixing message string UUID assignmentIma Mechanique
2013-11-21merge changes for 3.6.11-releaseOz Linden
2013-11-21storm-1831 Cleaning up colour LLSD processing code which is no longer used ↵Ima Mechanique
as colours come from the colors XML file.
2013-11-21storm-1831 Cleaning up output messages SyntaxLSL.Ima Mechanique
2013-11-21merge changes for 3.6.11-releaseOz Linden
2013-11-21increment viewer version to 3.6.12Oz Linden
2013-11-21Added tag 3.6.11-release for changeset 2feb70a4cfdeOz Linden
2013-11-21Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-11-21fix for SH-4629: Interesting: crash at LLViewerRegion::killObjectXiaohong Bao
2013-11-21merge changes for open-196Oz Linden
2013-11-21MAINT-3480 FIXED Duplicated strings are deletedMnikolenko ProductEngine
2013-11-21MAINT-3471 FIXED Set USER_LOCALE when updating item count.Mnikolenko ProductEngine
2013-11-21storm-1831 Removing am uneccessary message.Ima Mechanique
2013-11-20BUILDFIX: forgot template parameterRichard Linden
2013-11-20SH-4626 FIX: [INTERESTING RC] Viewer randomly crashes when I click on links ↵Richard Linden
in IMs or group IMs
2013-11-21storm-1831 Replacing old region changed callback setup with the shiny new one.niel@mint-32
2013-11-20storm-1831 Expanding/fixing copyright headerniel@mint-32
2013-11-20Mergeniel@mint-32
2013-11-20STORM-68 Added default clause to switch statement to try to fix linux ↵Jonathan Yap
compile error.
2013-11-20revert changeset 05606ef22574: fix for SH-4629: Interesting: crash at ↵Xiaohong Bao
LLViewerRegion::killObject
2013-11-20mergeRichard Linden
2013-11-20STORM-68 Reapply changes to inventory processing lost in the merge.Jonathan Yap
Move call to updateCap back to where it was. The place it was moved to was too early in the login sequence and was causing a crash.
2013-11-19MAINT-2287 : Fix merge errors when merging viewer-releaseMerov Linden