summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2013-06-19Merge conflict mixup, use noaction instead of none for user preferenceMerov Linden
2013-06-19SH-4263 FIX - added yet another level of callback kludgery to updateAppearanc...Brad Payne (Vir Linden)
2013-06-19NORSPEC-272 make sure the tex filtering fix stays putGraham Linden
2013-06-19Pull merge lindenlab/viewer-releaseMerov Linden
2013-06-19Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2013-06-19Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2013-06-19Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
2013-06-19Point light color (de)correction.Dave Parks
2013-06-19merge changes for 3.6.0-releaseOz Linden
2013-06-19merge increment of version numberOz Linden
2013-06-18Review cleanupDave Parks
2013-06-18Occlusion culling overhaul.Dave Parks
2013-06-18mergeBrad Payne (Vir Linden)
2013-06-18SH-4237 WIP - removed somewhat misleading warningBrad Payne (Vir Linden)
2013-06-18mergeBrad Payne (Vir Linden)
2013-06-18SH-4262 WIP - fix for the reordering bug in AIS regions.Brad Payne (Vir Linden)
2013-06-18merge with viewer-releaseNyx Linden
2013-06-18CHUI-979 FIXED Clear highlight after clicking in chat input. Do not flash cha...Mnikolenko ProductEngine
2013-06-18correct banding issueOz Linden
2013-06-18remove files incorrectly brought back from the past by mergesOz Linden
2013-06-18SH-4275: Fixed regression - appearances are no longer broadcasted before exit...prep@lindenlab.com
2013-06-17SH-4274 FIX Adding RegionHandshakeReply flags for SSANyx Linden
2013-06-17Fixed build issuemsavchenko@ubuntu
2013-06-17SH-4237 WIP - logging cleanup in onAIS handlingBrad Payne (Vir Linden)
2013-06-17merge changes for 3.6.0-releaseOz Linden
2013-06-17mergeBrad Payne (Vir Linden)
2013-06-17SH-4238 WIP - postpone calling notifyObservers until all deletes are processed.Brad Payne (Vir Linden)
2013-06-17CHUI-506 FIXED Don't change dropdown position if items are unchanged.Mnikolenko ProductEngine
2013-06-14increment viewer version to 3.6.1Oz Linden
2013-06-14NORSPEC-251 fix issues with binding unloaded standard bumpmapsGraham Linden
2013-06-14MAINT-2791: Yet another crash in LLTextureCache::writeToFastCache(). Reviewedsimon
2013-06-14WIP: sh-4035 backed out changes to appearance window confirmationprep@lindenlab.com
2013-06-14mergemberezhnoy
2013-06-14NORSPEC-266 fix issues with observer feedback on edits of material map parame...Graham Linden
2013-06-14Disable asserts in CalculateTangentArray (discussed with davep) to avoid debu...Graham Linden
2013-06-13NORSPEC-261 No more magic numbers, parity between forward and deferred render...Dave Parks
2013-06-13NORSPEC-250 speculative stab in the darkGraham Linden
2013-06-13SH-4250 WIP - logging tweaks and cleanupBrad Payne (Vir Linden)
2013-06-13MAINT-2787: Expand viewer_manifest.py's "Release" recognitionNat Goodspeed
2013-06-13STORM-1953 Notifications that involve deleting something -- errors in textJonathan Yap
2013-06-13Remove some now useless assertions.Dave Parks
2013-06-13NORSPEC-261 Put back directional ambient.Dave Parks
2013-06-13NORSPEC-261 Better blending of environment map.Dave Parks
2013-06-13NORSPEC-261 Fix for bad legacy shiny values.Dave Parks
2013-06-13Fix ternary use found illegit in the eyes of GCCGraham Madarasz
2013-06-13CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")mberezhnoy
2013-06-13Merge vwr-dev-matGraham Madarasz
2013-06-13correct DOS line endingsOz Linden
2013-06-13NORSPEC-263 replaced dropped deg to rad conversion between UI and material up...Graham Madarasz
2013-06-13MAINT-2632 speculative guards in display_startup based on prevalence of crash...Graham Madarasz