summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
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 pla...Oz Linden
2013-11-24normalize format of and add arch to all installer namesOz Linden
2013-11-23SH-4611 FIX - use an observer to scroll after category rename completesBrad Payne (Vir 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
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) a...maksymsproductengine
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 camm...Xiaohong Bao
2013-11-21combine the visiblities of octree group and object cache entry for visiblity ...Xiaohong Bao
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 lowes...Xiaohong Bao
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 as...Ima Mechanique
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-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 i...Richard Linden
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-20SH-4611 WIPBrad Payne (Vir Linden)
2013-11-20STORM-68 Added default clause to switch statement to try to fix linux compile...Jonathan Yap
2013-11-20revert changeset 05606ef22574: fix for SH-4629: Interesting: crash at LLViewe...Xiaohong Bao
2013-11-20mergeRichard Linden
2013-11-20STORM-68 Reapply changes to inventory processing lost in the merge.Jonathan Yap
2013-11-19MAINT-2287 : Fix merge errors when merging viewer-releaseMerov Linden
2013-11-19Automated merge with http://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-11-19SH-4606 FIX: Interesting: Small objects do not load until they are very close.Richard Linden
2013-11-19Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-11-19fix for SH-4629: Interesting: crash at LLViewerRegion::killObjectXiaohong Bao
2013-11-19SH-4634 FIX Interesting: Viewer crashes when receiving teleport offerRichard Linden
2013-11-19ACME-3319 : Consolidate Merchant Outboxes when several are present into one i...Merov Linden
2013-11-19merge up to 3.6.10-release; some of the storm-68 changes lostOz Linden
2013-11-19STORM-1980 Merge changes Oz made (new way of detecting an agent has changed r...Jonathan Yap
2013-11-19STORM-68 Place initial call to send cap in new, better location.Jonathan Yap
2013-11-19STORM-1980 Minor xml changeJonathan Yap
2013-11-19replace uses of LLEnvManagerNew::setRegionChangeCallback with LLAgent::addReg...Oz Linden