summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-02-24mergeTofu Buzzard
2011-02-24Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-02-24MergeXiaohong Bao
2011-02-24SH-1040 Make both model preview drop downs functionalleyla_linden
2011-02-24SH-1045leyla_linden
Mesh Viewer temporarily allows object scaling larger than 10m, then moves the object
2011-02-23mergeTofu Buzzard
2011-02-23Mergeleyla_linden
2011-02-23SH-1035 Model preview background color should match specleyla_linden
2011-02-23SH-301 Cleanup -- accidentally removed a multiply by sDistanceFactorDave Parks
2011-02-23SH-301 Use avatar distance and radius when calculating LoD for rigged ↵Dave Parks
attachments.
2011-02-23SH-473/CTS-248 Enable mirror and invert check boxes for meshes.Dave Parks
2011-02-23Merge: Backed out changes for STORM-336 for merge due to complexity, will ↵Loren Shih
need to apply these manually.
2011-02-23separate vertex buffer and index buffer when map/unmap VBO. can be treated ↵Xiaohong Bao
as part of STORM-1011. reviewed by davep.
2011-02-23Fixes from merge of viewer-development -> mesh-development.Loren Shih
2011-02-23Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-22mergeTofu Buzzard
2011-02-22mergeDave Parks
2011-02-22SH-874 Better VBO usage hints, most notably don't use VBOs for occlusion ↵Dave Parks
queries if GL is set to not use VBOs for stream draw.
2011-02-22mergeDave Parks
2011-02-22SH-438 Use node name instead of mesh name for object names when importing ↵Dave Parks
meshes.
2011-02-22Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-22set "RenderVBOMappingDisable" to be true by default to stop VBO memory leaking.Xiaohong Bao
2011-02-22more fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused ↵Xiaohong Bao
leaking.
2011-02-22mergeTofu Buzzard
2011-02-18Code cleanup and removed hacky code support for some old legacy rig typesprep linden
2011-02-18mergeDave Parks
2011-02-18SH-948 don't occlusion cull everything when deferred rendering is enabledDave Parks
2011-02-18Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-17mergeTofu Buzzard
2011-02-17mergeDave Parks
2011-02-17SH-1006 Quick pass at cutting down the number of redundant GL calls based on ↵Dave Parks
data from gDEBugger. Reviewed by Nyx.
2011-02-17mergeTofu Buzzard
2011-02-17mergeDave Parks
2011-02-17SH-547 Use appropriate texture channel for rendering avatars into their ↵Dave Parks
impostor map.
2011-02-17mergeTofu Buzzard
2011-02-17merge changes for storm-937Oz Linden
2011-02-17Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-02-17SH-959 FIX crash in llflexibleobject.cppNyx (Neal Orman)
Crash was a result of one of two possibilities: 1) trying to update geometry when it wasn't visible 2) mSimulateRes was non-zero when mInitialized was 0 Put code to handle both cases - initialize if mSimulateRes is 0 OR mInitialized is 0 But only do so if the object is visible. If the object is not visible, early out. Code reviewed by davep
2011-02-17mergeprep
2011-02-17Another part of the pelvis fix. Sh-634prep
2011-02-17Mesh-development work in progressLoren Shih
2011-02-16Mergeleyla_linden
2011-02-16SH-512 [REGRESSION] Linden trees scale up to 200m on Mesh regionsleyla_linden
SH-943 10 meters maximum Prim/Mesh size in latest Mesh Viewers
2011-02-16Fix for problem with pelvis offsetprep
2011-02-16SH-957 Turning off Atmospheric Shaders greys out Lighting and Shadows ↵leyla_linden
options in preferences but does not turn off shadows inworld
2011-02-16merge changes for storm-981Oz Linden
2011-02-16mergeTofu Buzzard
2011-02-16Fix for SH-816prep
2011-02-15Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-15mergeBrad Payne (Vir Linden)