summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-12-07Bug fix. Joint ids were not being reset. The issue was noticeable when you ↵prep linden
attached and then reattached a rigged mesh with offsets. The reattached mesh would not be offset correctly.
2010-12-06Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-12-06BUILDFIX linux build broken due to a merge conflictsNyx (Neal Orman)
merge broke the linux build, we were trying to strip a script which is a non-binary file. Restored the correct syntax and build works again. yay! Reviewed by Prep
2010-12-06Fix for SH-542prep
2010-12-03Mergeleyla_linden
2010-12-03Mergeleyla_linden
2010-12-03changing colladadom url from https to http to prevent urllib errorsleyla_linden
2010-12-03VWR-21764 FIX: changed two vars for curl_easy_getinfo to doubleBrad Payne (Vir Linden)
2010-12-03mergeBrad Payne (Vir Linden)
2010-12-03updated message template md5sumBrad Payne (Vir Linden)
2010-12-03automated merge from mesh-developmentLoren Shih
2010-12-03Fix for overlapping UI elements in panel_preferences_graphics1 due to bad merge.Loren Shih
2010-12-03Fix for clobbered deferred rendering UI.Loren Shih
Fix for compile errors from llappviewer.cpp merge.
2010-12-03mergeDave Parks
2010-12-03Get rid of CameraCoC and adjust focal length and fnumber for every day use.Dave Parks
2010-12-03mergeBrad Payne (Vir Linden)
2010-12-03Added timer-related logging during logperformanceBrad Payne (Vir Linden)
2010-12-03Automated merge up from viewer-developmentLoren Shih
2010-12-03Fix for SH-479prep linden
2010-12-03Automated merge up from viewer-developmentLoren Shih
2010-12-03pull latest fixes back from viewer-betaOz Linden
2010-12-03mergeDave Parks
2010-12-03Add extern declarations of GL_ARB_framebuffer_object to glheades.hDave Parks
2010-12-03DoF tweaks -- halo hiding, etc.Dave Parks
2010-12-03Automated merge with https://hg.secondlife.com/mesh-developmentDave Parks
2010-12-03Fix a complaint from gcc about inaccessible base.Dave Parks
2010-12-03#ifdef out ll_align_malloc/free (gcc 4.2 is unhappy about some of the syntax ↵Dave Parks
there)
2010-12-03Update glext.h for 32-bit linux.Dave Parks
2010-12-03mergeDave Parks
2010-12-03Add CameraCoCRatio to make DoF depending on screen resolution.Dave Parks
2010-12-03Automated merge with https://hg.secondlife.com/mesh-developmentDave Parks
2010-12-03Switch default platform SDK to 10.6Dave Parks
2010-12-03Apparently the new standard is to NOT suffix ARB extension function pointers ↵Dave Parks
with ARB.
2010-12-03Remove RenderUseFBO from featuretables.Dave Parks
2010-12-02MergeDave Parks
2010-12-02SH-373 Update glext.h, disable anti-aliasing on ATI when rendering deferred. ↵Dave Parks
Get rid of RenderUseFBO debug setting (only use FBO when rendering deferred). Use GL_ARB_framebuffer_objects instead of GL_EXT_...
2010-12-02mergeBrad Payne (Vir Linden)
2010-12-02Cleaning up fast timer fixesBrad Payne (Vir Linden)
2010-12-02merge fixes for STORM-432Oz Linden
2010-12-02CHOP-240 Fix for incorrect use of std:multimap iterators. Rev. by Alain.Mark Palange (Mani)
2010-12-02merge fix for STORM-679Oz Linden
2010-12-02merge fix for STORM-596Oz Linden
2010-12-02merge fix for STORM-557Oz Linden
2010-12-02Avoiding more RDTSC dependencies in fast timersBrad Payne (Vir Linden)
2010-12-02automated merge up from viewer-developmentLoren Shih
2010-12-02Automated mergeLoren Shih
2010-12-02STORM-432 ADDITIONAL FIX Disabled manual resizing of the bottom panel in ↵Vadim ProductEngine
the Places SP.
2010-12-02SH-437 Fix for crash when setting RenderGlow to FALSE when deferred ↵Dave Parks
rendering is on.
2010-12-01CHOP-238 Fix to bug introduced by ↵Mark Palange (Mani)
http://hg.secondlife.com/viewer-beta/changeset/4072bd5389b2 Reviewed by Brad
2010-12-01Fixes for viewer-development merge into viewer-mesh.Loren Shih
Manually merged llappviewer and viewer_manifest.py.