summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-02-10Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-09STORM-986 : pull into viewer-developmentMerov Linden
2011-02-09mergeDave Parks
2011-02-09SH-920 Wait for threads to shut down before deleting them -- also, fix some ↵Dave Parks
assertions that were encouraging people to comment out the destruction of LLSignal.
2011-02-09pull from viewer-developmentMerov Linden
2011-02-09Mergeleyla_linden
2011-02-09SH-938 [REGRESSION] Mesh costs and old style costs shown in Edit tools on ↵leyla_linden
mesh region with MeshEnabled set to False
2011-02-09mergeDave Parks
2011-02-09SH-874 Revert much of the bad water bounding box and distortion texture ↵Dave Parks
usage changes from SNOW-643 and properly occlusion cull void water patches for machines without depth clamp.
2011-02-09SH-874 Fix for bad performance on cards without GL_ARB_depth_clamp in cases ↵Dave Parks
where water and terrain should be occluded.
2011-02-09Line endings.Dave Parks
2011-02-09Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-09trivial: remove some redundant code.Xiaohong Bao
2011-02-09Mergeleyla_linden
2011-02-09SH-840 Convert resource cost physics cost to prim countleyla_linden
2011-02-09Additional fix for llmediaplugintest compilation failure after fix for VWR-21275callum
2011-02-09debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in ↵Xiaohong Bao
LLSurface::getWaterHeight
2011-02-08STORM-601 : pull into viewer-developmentMerov Linden
2011-02-08STORM-433 : pull into viewer-developmentMerov Linden
2011-02-08STORM-507 : pull into viewer-developmentMerov Linden
2011-02-08STORM-953 : pull into viewer-developmentMerov Linden
2011-02-08STORM-955 : pull into viewer-developmentMerov Linden
2011-02-08STORM-960 : pull into viewer-developmentMerov Linden
2011-02-08VWR-21275 FIX // *SOME* Windows systems fail to load the Qt plugins if the ↵callum
current working Reviewed by Richard - http://codereview.lindenlab.com/6011001/
2011-02-08SH-534 Don't allow deferred rendering to be enabled on windows PC's with GL ↵Dave Parks
version less than 3.0.
2011-02-08Mergeleyla_linden
2011-02-08SH-545 [REGRESSION] Enabled Basic Shaders Can Cause an Unrecoverable System ↵leyla_linden
Lock Up originally done in http://bitbucket.org/leyla/leyla-mesh-development
2011-02-08Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-02-08SH-940 FIX crash on startupNyx (Neal Orman)
Setting the lighting detail happens when we force a graphics level on startup. This got added with handleRenderLocalLightsChanged, which got added recently. setLightingDetail is safe to call with the pipeline uninitialized. Removing the assert to stop the crash. Fix verified to be safe by davep.
2011-02-08MergeDave Parks
2011-02-08SH-523 Fix for non-finite values in silhouette rendering resulting in ↵Dave Parks
silhouette segments pointing at center of screen.
2011-02-08Reduce number of potential joints in a rigged mesh to 32 for backwards ↵Dave Parks
compatibility with ATI X1950
2011-02-08Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-07SH-930 FIX revert ARC algorithm for merge to viewer-developmentNyx (Neal Orman)
Reverting incomplete changes to ARC so that we don't change RC when we merge down.
2011-02-07Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-02-07SH-923 FIX particle render cost does not appear to be functioning properlyNyx (Neal Orman)
was checking the age of the particle system, not the individual particles. This appears to fix the problem. Deferring QA on the new algorithm until it is completed.
2011-02-04STORM-610 : Backing out that change (test fail)Merov Linden
2011-02-04Clean up license headers in a handfull of filesMerov Linden
2011-02-04STORM-655 : Pull into viewer-developmentMerov Linden
2011-02-04STORM-610 : Pull into viewer-developmentMerov Linden
2011-02-04STORM-601 FIXED Color swatch now receives focus on mouse click.Seth ProductEngine
2011-02-04STORM-433 FIXED Fixed reshaping notification panel with friendship offer ↵Seth ProductEngine
when it is inserted into IM chat.
2011-02-04Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-04STORM-465 FIXED Made all keys localizable.Vadim ProductEngine
Renamed HUD direction strings ("Left", "Right", "Up", "Down") to avoid strings duplication.
2011-02-03Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-02-03SH-861 FIX update render cost algorithm to use geometry triangle countsNyx (Neal Orman)
base cost is now geometry-based, for both meshes and prims Some of the previous weights have been recalibrated based on testing. Code reviewed by davep. Deferring QA for now until the other parts of the algorithm are updated, as re-generating the test takes time each time the algorithm changes.
2011-02-03SH-580 FIXED Crash in curl on exitLoren Shih
New defensive programming added this llerrs trigger. This is worth investigating but not at the top of our priority at the moment. Reverting to llinfos for now as has been done for non-Windows builds already.
2011-02-03STORM-513 : pull into viewer-developmentMerov Linden
2011-02-03STORM-397 : pull into viewer-developmentMerov Linden
2011-02-03STORM-316 : pull into viewer-developmentMerov Linden