summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-12-22Merge with tip of viewer-developmentcallum
2010-12-22Merge with TiggsDon Kjer
2010-12-22Merge with viewer-developmentDon Kjer
2010-12-22Cleanup from review with Andrew and MerovDon Kjer
2010-12-22STORM-808 : merge webkit upgrade to Qt v4.7.1Merov Linden
2010-12-22mergeDave Parks
2010-12-22SH-658 Preserve LOD mode when switching between preview LoDs.Dave Parks
2010-12-22STORM-806 FIXED Enabled external editor for inventory scripts.Vadim ProductEngine
Changes: * Moved external editor handling to LLScriptEdCore which is shared between LLLiveLSLEditor (object script editor) and LLPreviewLSL (inventory script editor). * The Edit button is now only enabled when appropriate.
2010-12-22Setting viewer version numbers back to what they were as per Merov's review ↵Andrew Meadows
request.
2010-12-22mergeAndrew Meadows
2010-12-22removing some very old debug spamAndrew Meadows
2010-12-22Automated merge up from viewer-developmentLoren Shih
2010-12-22Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2010-12-22fix for SH-648: Crash on exit in LLViewerFetchedTexture (ref count error)Xiaohong Bao
2010-12-22mergeAndrew Meadows
2010-12-22Automated merge from mesh-developmentLoren Shih
2010-12-22mergeAndrew Meadows
2010-12-22STORM-466 Fix for: minimap cannot be reset to default zoomJonathan Yap
2010-12-22MergeDave Parks
2010-12-22Update llconvexdecomposition and fix gcc compiler errorDave Parks
2010-12-22Update llconvexdecompostionDave Parks
2010-12-22mergeDave Parks
2010-12-22SH-636 Update physics tab to new spec, move "completed" physics decomp ↵Dave Parks
callbacks to main thread, add object model to decomposition tool, make imported model scales non-uniform.
2010-12-21SOCIAL-374 FIX (Windows) Avatar images not loading on join.secondlife.com in ↵callum
Webkit 4.7 Updated llqtwebkit build for Windows from changeset f8e31d21585d in the llqtwebkit repository.
2010-12-21Mergeleyla_linden
2010-12-21fixed wizard model not previewing issues and added pan/zoomleyla_linden
2010-12-21SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7Monroe Linden
Updated llqtwebkit build for Mac from changeset f8e31d21585d in the llqtwebkit repository.
2010-12-21SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7Monroe Linden
Reviewed by Callum
2010-12-21STORM-151 : pull in viewer-developmentMerov Linden
2010-12-21STORM-460 : pull in viewer-developmentMerov Linden
2010-12-21STORM-524 : pull in viewer-developmentMerov Linden
2010-12-21STORM-453 : pull in viewer-developmentMerov Linden
2010-12-21Automated merge up from viewer-developmentLoren Shih
2010-12-21SH-689 Fix build issue due to assert i llviewerassetstatsLoren Shih
Changed assert to 50 since that's the new asset count. Added OTHER metrics for mesh and dummy asset types.
2010-12-21Merge from trunkAndrew A. de Laix
2010-12-21Automated merge up from viewer-developmentLoren Shih
2010-12-21Automated merge from mesh-developmentLoren Shih
2010-12-20STORM-151 : Fix llui_libtest integration testMerov Linden
2010-12-20model upload wizard - added optimization and state changesleyla_linden
2010-12-20SOCIAL-399 FIX Viewer crash when canceling http auth on a media primMonroe Linden
Reviewed by Callum at http://codereview.lindenlab.com/5636001
2010-12-20Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-12-20SH-68 WIP adding debug switch for performance testingNyx (Neal Orman)
Adding functionality to a previously added debug switch. This will allow me to have UI, etc turned off and thus not impact framerates when testing for rendering features.
2010-12-20mergeBrad Payne (Vir Linden)
2010-12-20SH-682 FIX, SH-594 FIX - removed mFMP wrapper, added thread checking. Moved ↵Brad Payne (Vir Linden)
onIdle functions to llcallbacklist.
2010-12-20Fix for windows build. Reviewed by Nyx.Dave Parks
2010-12-20STORM-805 : Fix the map URLMerov Linden
2010-12-20Fix for a couple of minor merge issues.Monroe Linden
2010-12-20Remove unimplemented software updater option. Fix potential double start of ↵Andrew A. de Laix
updater service.
2010-12-20Merge from viewer-development.Monroe Linden
2010-12-20fix for ER-350; wait until connection is finished before send update. rvw'd ↵tiggs@lindenlab.com
by Nyx
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 04:21:42 +0000