summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
AgeCommit message (Collapse)Author
2014-07-07Merge viewer-release and become version 3.7.12simon
2014-06-24Merge viewer-release and become version 3.7.11simon
2014-06-23merge changes for 3.7.10-releaseOz Linden
2014-06-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-06-17Merge viewer-release and become version 3.7.9simon
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-05-14v-r -> s-e merge WIPBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07Merge downstream version 3.7.8 codesimon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile ↵Merov Linden
errors
2014-04-22merge up to 3.7.6-releaseOz Linden
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-03-14merge changes for 3.7.3-releaseOz Linden
2014-03-12mergeBrad Payne (Vir Linden)
2014-03-12merge with releaseRichard Linden
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-10merge changes for 3.7.3-releaseOz Linden
2014-03-03merge changes for 3.7.2-releaseOz Linden
2014-02-25Merge viewer-releasesimon
2014-02-25merge changes for 3.7.2-releaseOz Linden
2014-02-25merge viewer-release to sunshine-externalBrad Payne (Vir Linden)
2014-02-24merge with releaseRichard Linden
2014-02-24Pull merge from viewer-releaseMerov Linden
2014-01-31fix some compiling errorsXiaohong Bao
2014-01-31fix some flaws for memory corruptionXiaohong Bao
2014-01-23merge changes for 3.6.13-releaseOz Linden
2014-01-09fix for SH-4659:crash at LLOcclusionCullingGroup::doOcclusion line 1150Xiaohong Bao
2014-01-08trivial: convert to unix line endings.Xiaohong Bao
2014-01-07merge changes for 3.6.12-releaseOz Linden
2014-01-06fix a compiling error for mac and linux.Xiaohong Bao
2014-01-06fix for SH-4656: crash at LLVOCacheEntry::updateParentBoundingInfo() line 510Xiaohong Bao
2013-12-17merge fixBrad Payne (Vir Linden)
2013-12-12Pull merge from lindenlab/viewer-releaseMerov Linden
2013-12-11removing of dos line endingmaksymsproductengine
2013-12-10STORM-68 Move initial call to POST default permissions to a better location.Jonathan Yap
2013-12-10Re-fix merge issue that removed "AvatarRenderInfo" cap usagesimon
2013-12-05fix for SH-4631: Parts of linked objects are not shown in new release Second ↵Xiaohong Bao
Life 3.6.11
2013-12-05STORM-68 Code cleanup/function renamingJonathan Yap
2013-12-05mergeBrad Payne (Vir Linden)
2013-12-04Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-12-04fix for SH-4631: Parts of linked objects are not shown in new release Second ↵Xiaohong Bao
Life 3.6.11
2013-12-03STORM-68 Change CAP name to AgentPreferences and adjust LLSD format to mesh ↵Jonathan Yap
with server changes
2013-12-02merge with releaseRichard Linden
2013-11-25Merge. Refresh from viewer-release after 3.6.11 release.Monty Brandenberg
2013-11-22fix for SH-4635: Interesting: Some objects do not load on the second visitXiaohong Bao
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-21fix for SH-4629: Interesting: crash at LLViewerRegion::killObjectXiaohong Bao
2013-11-20revert changeset 05606ef22574: fix for SH-4629: Interesting: crash at ↵Xiaohong Bao
LLViewerRegion::killObject
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.