summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmorph.cpp
AgeCommit message (Collapse)Author
2024-05-01Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-mergeAndrey Lihatskiy
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2023-09-25SL-20276 shape thumbnails should display front of avatar regardless of ↵Maxim Nikolenko
'AppearanceCameraMovement' setting
2022-03-29SL-16811 Shape preview images do not display all of the attachments #2Andrey Kleshchev
Merged previewAvatar and generateImpostor into a single function since they are nearly identical
2022-02-18SL-16811 Shape preview images do not display all of the attachments.Andrey Kleshchev
2021-11-30SL-16386 replace gutted LLRender::setAlphaRejectSettings() with explicit flush()Dave Houlton
2021-11-30SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunctionDave Houlton
2017-10-27MAINT-1114 crash at LLVOAvatar updateGeometry()andreykproductengine
2015-11-10remove execute permission from many files that should not have itOz Linden
2013-09-19SH-3455 WIP - removing bake upload codeBrad Payne (Vir Linden)
2013-06-21SH-4240 FIX Users can set their hover height to 0Nyx Linden
Adjusted the startup conditions, and relogging should apply the enforcement as appropriate now. Note that this affects the startup enforcement and should re-test the macro avatar loading bug.
2013-05-21mergeBrad Payne (Vir Linden)
2013-05-08SH-4048 SH-4171 SH-4046 FIX avatar sinks into ground, updates sent to observersNyx Linden
Avatar preview code was triggering avatar size updates, which were causing the avatar's height above the ground to change when the previews were rendered. Also added code to suppress appearance updates being sent out while in appearance editing mode.
2013-05-02SH-4060 FIX avatar hover being set to minimum at seemingly random timesNyx Linden
avatar hover was being temporarily set to -2.0 for the preview render, which was triggering the minimum enforcement, even when the user's requested value is no where near the minimum. Added a flag to disable the minimum enforcement if we are temporarily changing the value.
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-09-20Partial rewrite of llifstream and llofstream (Windows implementation ↵Don Kjer
pending). Moved more functionality from llviewerwearable to llwearable
2012-05-07MAINT-753 : [crashhunters] crash at LLVOVolume::updateFaceFlags(). Null ↵simon@Simon-PC.lindenlab.com
pointer checks are good. Reviewed by Kelly
2011-09-14SH-2243 work in progress -- application side matrix stack managementDave Parks
2011-08-11SH-2242 FXAA support instead of unreliable multisample textures (done here ↵Dave Parks
because it's a smaller change than integrating glVertexAttrib with FSAA pipe). Shader integration with LLDynamicTexture subclasses.
2010-12-10STORM-693 FIXED Preview thumbnails in the Edit Wearable and Edit Body Parts ↵Seth ProductEngine
panels now follow opacity settings for inactive floater. When the floater is active the thumbnails are opaque. The behavior is similar to texture control's.
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-15EXT-8135 FIXED Textures blurry when in Appearance Edit modeLoren Shih
EXT-8445 Reduce baked texture timeout fro 120sec to 60sec default Also did some minor infrastructure cleanup, added code comments, etc. There is now separate logic for determining how to handle update (versus upload) requests. Also made a trivial change to llvoavatar to properly encapsulate mAppearanceAnimating. Also reduced the baked texture timeout to 60s (in settings.xml)
2010-06-07thumbnail previews background image restoredRichard Nelson
reviewed by erica
2010-06-04EXT-7492 FIX Invalid previews are loaded for body parts in the Appearance SPRichard Nelson
reviewed by Nyx
2010-05-27EXT-7209 EXT-7366 EXT-7213 FIX EXT-7392 WIPNyx (Neal Orman)
Final fixes for: EXT-7209 camera to enter appearance edit mode EXT-7366 change camera to face front of avatar in previews EXT-7213 kill old appearance editor Partial fix for: EXT-7392 alpha mask checkboxes are not hooked up All changes code reviewed by vir. Following commits (plus this one) reviewed with this checkin: 425d4e960450 15d04b6464a7 e92ae606de12 adc94512ea9b 24577dbbf7a4 6f28b241eae2 (sorry dessie! :) )
2010-05-24AVP-92 FIX Avatar appears to be fat when opening the shape editorNyx (Neal Orman)
Wearable editor previews were affecting the in-world avatar and not properly resetting the changed parameters. Since the "body fat" slider is the last in the default tab for the shape editor, this leaves your avatar fat. Reconfigured the code to work through the wearables and most importantly included a call to updateVisualParameters() at the end of the render function. This appears to have fixed the issue - your avatar does not appear affected during the avatar preview generation anymore. Code reviewed by Seraph
2010-04-12(slightly hairy) merge from viewer-hotfixTofu Linden
2010-04-09debug code for EXT-6791: Intel 965 Crash in glCopyTexSubImage2D.Xiaohong Bao
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-25EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Minor superficial cleanup to have all references to getAvatarObject use LLVOAvatarSelf *avatarp = gAgent.getAvatarObject()
2010-02-08Fix for blend func being screwed up at init.Dave Parks
Fix for avatar appearance editor drawing hair in the background.
2009-11-16EXT-1068 appearance editor previews do not updateNyx (Neal Orman)
addendum: re-added changes to avatar-parameters as well as wearable parameters so that the system knows to re-update the local composite after rendering each preview. Code reviewed by Bigpapi --HG-- branch : avatar-pipeline
2009-11-16EXT-2445 appearance editor doesn't show correct previewsNyx (Neal Orman)
This system is in dire need of a rewrite, but the bug reported is fairly simple. The visual params in the avatar are no longer authoritative, the real values are stored in the wearable itself. The appearance editor was manipulating the values in the avatar object, resulting in no change. Updated the preview windows to use the parameter objects stored in the wearable. Code reviewed by Bigpapi --HG-- branch : avatar-pipeline
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-03-05Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).Eric Tulla
No conflicts in the merge. Result of: svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
2009-01-13svn merge -r106055-107012 ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
merge release-QAR-508 Viewer 1.20 RC 4 merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
QAR-424
2008-03-11merge Branch_1-19-1-Viewer -r 80930 : 81609 -> releaseSteven Bennetts
DEV-11202: Unhandled Excpetion in pipeline.cpp. Merged over updated windlight ui help text from windlight14. Reverting a const change in a virtual that was not propagated to all overrides. DEV-10957 stop and pause Media and music buttons do not work DEV-10762 Displayed page in the client browser disappears when crossing property boundaries. DEV-11220 replace misspellings in alerts.xml parameters of 'messsage' DEV-11221 fix a misspelling of 'participants' in floater_chat_history.xml tooltip DEV-11193 clean up some viewer strings related to Windlight help text svn merge -r81144:81147 svn+ssh://svn/svn/linden/branches/1-19-1-viewer-threads DEV-11110 Media browser history dropdown does not save items across sessions Ran the xuiparse -process tool on all en-us xml files. This does NOT change any data, merely reorders attributes and cleans up tab/spacing. DEV-11349 XML CLEANUP: fix duplicate sibling names in en-us xui files DEV-11348 Change to llmimetypes.cpp broke Media Type dropdown dev-10623 "parcels that played movies no longer work in combo-merge-ui" DEV-11379 - crash in LLTabContainer::draw() DEV-11377 Elminiate dangerous LLLinkedList and LLDoubleLinkedList from newview DEV-11158 sculpties on the top10 crash list DEV-11404 "Send Current URL to Parcel" does not set the MIME type merge 80958:80959 maint-ui-9-qa, DEV-11105 -- Searching for people with 3 characters like "j l" hurts the database. DEV-10489: no draw distance cheating DEV-879: water noise frequency DEV-10764: macbook air support DEV-10878: Linux Intel945 support DEV-7551: featuretable adjustments for framerate. DEV-11426 Enormous mini-map. DEV-11505 - Crash in gunzip_file. Removed final LinkedList, SkipMap, and AssocList templates from the Viewer! DEV-11115 truncated word in the Advanced Water Editor's modal help dialog
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.