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
f65cddf860
Merge branch 'contribute' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/lluuid.cpp
# indra/llcommon/lluuid.h
# indra/llprimitive/llmodel.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/llinventorymodel.cpp
# indra/newview/llviewerwearable.h
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/da/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/de/floater_perm_prefs.xml
# indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/en/strings.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
# indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/it/floater_perm_prefs.xml
# indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/ja/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/pl/floater_about.xml
# indra/newview/skins/default/xui/pl/floater_about_land.xml
# indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
# indra/newview/skins/default/xui/pl/floater_associate_listing.xml
# indra/newview/skins/default/xui/pl/notifications.xml
# indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml
# indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/pl/panel_profile_pick.xml
# indra/newview/skins/default/xui/pl/panel_profile_picks.xml
# indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/pl/panel_region_access.xml
# indra/newview/skins/default/xui/pl/panel_script_experience.xml
# indra/newview/skins/default/xui/pl/strings.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
# indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
2023-03-01 12:54:24 +01:00
bf7faa3267
Faster and simpler inventory category hashing.
...
This commit changes inventory category hashing from slow LLMD5 to fast HBXX128 hashing, and allows to use a simple LLUUID for the hash, instead of an LLMD5 instance.
It also removes some old cruft dealing with unused baked texture hashing.
2023-02-06 11:30:23 +01:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
2c4a3e7610
Crash in LLPanelEditWearable::isDirty(): Make sure there's no dangling pointer to a LLWearable.
2016-02-17 12:18:53 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
ae6440eecc
MAINT-4744: Eliminate viewer dependency on (old) GNU libstdc++.
...
To be more accurate, this changeset doesn't actually eliminate the dependency:
it eliminates the use cases for the llifstream / llofstream feature that
requires it.
Currently you can construct an llifstream or llofstream from an open LLFILE*
file handle (or, except on Windows, an int file descriptor). But rather than
containing a streambuf implementation based on FILE*, llfile.h relies on the
fact that the Windows std::filebuf happens to support that as a nonstandard
extension; also on a nonstandard GNU extension __gnu_cxx::stdio_filebuf<char>.
To move from GNU libstdc++ to clang's libc++ (the direction on Mac), we could
code a streambuf that supports FILE*. But before doing that, it's worth asking
whether anyone actually uses this questionable feature.
In fact there were only two methods: LLWearable::exportFile() and importFile()
-- and only one call to either, in LLViewerWearable::saveNewAsset(). The code
in saveNewAsset() opened the LLFILE* immediately before calling exportFile(),
meaning we could reasonably push the open operation down into exportFile().
That logic was complex anyway due to the need for the caller to close the
LLFILE* regardless of the success of the exportFile().
Change LLWearable::exportFile() and importFile() to accept a std::string
filename rather than an open LLFILE*. Change LLViewerWearable::saveNewAsset()
to simply call exportFile(filename) rather than horsing around with an LLFILE*
handle. (This improves the code in another way too: it encapsulates the need
to open the relevant file in binary mode. Previously, each caller had to
remember to do that.)
To prevent inadvertent reintroduction of ll[io]fstream(LLFILE*) code, add
llstream_LLFILE preprocessor macro (default 0) to control access to the
relevant constructors. Also suppress rdbuf() override, the only method whose
signature references llstdio_filebuf.
2015-01-28 15:55:18 -05:00
546b276eba
Fix merge issue
2015-01-18 17:18:23 +01:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
1a974f227d
Update to build on Xcode 6.0: typedef declared protected incorrectly here
2014-10-20 11:21:54 -07:00
8392fde6f6
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
2014-06-02 22:32:16 +01:00
75538968db
MAINT-4009: Patching the final leak of LLViewerFetchedTexture objects occurring because the LLWearable class was not properly destroying itself.
2014-05-14 19:49:13 +01:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
82f147367f
SH-3455 WIP - removing bake upload code
2013-09-19 11:10:59 -04:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
705a23ac0d
SH-3803 FIX Missing Wearable reported in sunshine viewer
...
Newly refactored wearable parsing did not account for extra whitespace cleanly.
Updated the code to handle extra blank lines in the wearable assets.
2013-02-14 13:41:36 -05:00
9b17340332
A real fix for visual_param_index_map_t from Sovereign Engineer
2013-10-12 14:36:55 -06:00
0112d4538f
Pacify clang by giving llviewerwearable public access to visual_param_index_map_t
2013-10-12 10:53:38 -06:00
f9a5cdba50
Started stubbing out llsd support for tex layer information.
2012-09-28 01:06:17 +00:00
7153d1db11
Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable
2012-09-20 04:29:17 +00:00
f1d6052e36
SH-3264 Moved over a few more items to llappearance
...
moved over:
isWearingWearableType
wearable::writeToAvatar
wearable::mTEMap (stores LocalTextureObject*)
more from wearable::import/export
wearable::createVisualParams, etc
2012-09-11 11:59:45 -04:00
85d0bcc063
Extracted mWearableDatas from LLAgentWearables into llappearance/LLWearableData. Moved LLDriverParam into llappearance
2012-09-06 02:53:55 +00:00
0c7623f628
Cleanup of llappearance refactor file definition order for easier diff'ing
2012-09-03 08:37:58 +00:00
c355fb98d3
Extracted texture baking system into llappearance library.
2012-09-03 06:12:50 +00:00
51fabc3850
SH-3261 SH-3324 WIP Starting extraction of wearable/appearance libraries
...
First pass at cmake configs, and starting to try to move wearable class.
Things are broken, checkpointing work to collaborate.
2012-08-21 18:21:11 -04:00
Ansariel