0ecfbc3de9
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
2024-05-16 14:10:55 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
9dc3651d0c
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/lltexlayer.cpp
# indra/llappearance/lltexlayer.h
# indra/llappearance/lltexlayerparams.cpp
# indra/llappearance/llwearabletype.cpp
# indra/llcharacter/llbvhloader.cpp
# indra/llcharacter/llbvhloader.h
# indra/llcharacter/llcharacter.cpp
# indra/llcharacter/llcharacter.h
# indra/llcharacter/lljoint.h
# indra/llcharacter/llvisualparam.cpp
# indra/llfilesystem/lldir_win32.cpp
# indra/llfilesystem/lldir_win32.h
# indra/llinventory/llparcel.cpp
# indra/llmath/llmath.h
# indra/llmath/llvolume.cpp
# indra/llmessage/lldatapacker.h
# indra/llxml/llxmltree.h
# indra/newview/CMakeLists.txt
# indra/newview/llagentwearables.cpp
# indra/newview/llagentwearables.h
# indra/newview/lldirpicker.cpp
# indra/newview/llphysicsmotion.cpp
# indra/newview/llviewergesture.cpp
# indra/newview/llviewerjointattachment.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexlayer.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvoavatarself.h
2024-02-18 00:09:57 +01:00
9e854b697a
misc: BOOL to bool
2024-02-17 12:23:07 +02:00
9a044f4a52
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llappearance/llavatarappearance.h
# indra/llappearance/lldriverparam.h
# indra/llappearance/llviewervisualparam.cpp
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llcharacter/llcharacter.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/llagent.cpp
# indra/newview/llcallbacklist.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llpanelnearbymedia.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
2024-02-13 00:54:24 +01:00
1839def9dc
even more misc: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
4419bb8709
more misc: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
70f8dc7a4f
miscellaneous: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
546b276eba
Fix merge issue
2015-01-18 17:18:23 +01:00
8392fde6f6
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
2014-06-02 22:32:16 +01:00
0160c514c5
MAINT-4077: Refactoring to add copy constructors to the LLVisualParam class and all of its derived descendants in order to clarify ownership of memory pointers.
2014-05-23 21:56:44 +01:00
76023f172c
MAINT-4009: Patching a leak of LLVisualParam derived objects that were being leaked because the LLWearable class was not destroying itself properly.
2014-05-14 22:55:19 +01:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
82f147367f
SH-3455 WIP - removing bake upload code
2013-09-19 11:10:59 -04:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
f5a4c277cb
SH-3500 FIX - added additional logging to allow params in various locations to be distinguished
2012-11-07 15:28:38 -05:00
2a9448f90a
SH-3500 FIX - removed an overzealous warning message
2012-11-07 10:51:51 -05:00
7d6da2ebe8
more param location logging, added wearable type info to dumpArchetypeXML
2012-10-17 13:43:19 -04:00
22f53c8558
additional debugging info, including tracking where visual params live
2012-10-15 18:41:55 -04:00
e29b66ed6c
additional fixes for avoiding avatar param manipulation via wearables, setting correct state from avatar appearance
2012-10-03 17:13:18 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
f89bbd3baa
EXT-7838 FIX - viewer 2.1 avatars look ruth-shaped to viewer-2 users
...
Added a third visual param group VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
to specify visual params that are user-tweakable, but should not be sent
over the network.
We should have this group *only* for new user-tweakable visual parameters
that should not be sent over the network. These should only be used for
*new* parameters that only contribute to the generation of baked textures.
Code reviewed by Richard
2010-06-24 17:21:18 -04:00
08ee190ec8
EXT-7499 WIP Prevent other avatars from remaining with a ruth shape
...
to be reviewed by nyx.
2010-06-01 22:30:14 +01:00
f6406b7174
EXT-2173 use of visual param animation inconsistent at best
...
removed ambiguous parameter "set_by_user" from many places in codebase,
renaming it to be upload_bake, which is a more accurate descriptor.
This allowed me to see several inconsistencies in how this variable was
being set - these errors were also fixed. User-visible result should be
that baked textures are not reuploaded on changing avatar sex until the
save button is pressed. primary win here is code clarity.
Code reviewed by Bigpapi.
2009-11-11 16:37:59 -05:00
65f5348997
EXT-1945 visual parameter animations broken
...
First round of fixes for trying to fix the visual param animations
Code reviewed by Seraph
2009-10-29 15:13:27 -04:00
5164ed388c
Code audit for r136515 ("merging in new wearable infrastructure...")
...
No expected functionality change; this mostly contains cosmetic cleanup.
Reviewed by: Nyx
2009-10-21 21:37:27 +00:00
0d6f1d125e
EXT-1664 bugfix for male avatars have female bodies
...
Found a couple bugs in the code relating to cross-wearable visual param linking.
Fixed with this patch - cross-wearable and inter-wearable visual params should
now link properly for both wearable-owned and avatar-owned parameters.
Code reviewed by Seraph
2009-10-19 18:23:19 +00:00
d08b0b6ae8
merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command:
...
svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .
Progress can be tracked in DEV-32551.
-Nyx
2009-10-16 17:56:30 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
1c909afe39
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-02 21:24:47 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Ansariel