Ansariel
|
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 |
|
Ansariel
|
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 |
|
Andrey Lihatskiy
|
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 |
|
Ansariel
|
314639426d
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llchat.h
# indra/llui/llcombobox.cpp
# indra/llui/llcontainerview.h
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderview.cpp
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmultifloater.cpp
# indra/llui/llmultifloater.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/llui/llspinctrl.cpp
# indra/llui/llspinctrl.h
# indra/llui/lltabcontainer.cpp
# indra/llui/lltabcontainer.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llui/llview.h
# indra/llui/llviewereventrecorder.cpp
# indra/llxml/llcontrol.cpp
# indra/llxml/llcontrol.h
# indra/newview/llagentlanguage.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llchicletbar.cpp
# indra/newview/llfloaterbuildoptions.cpp
# indra/newview/llfloaterbuildoptions.h
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llfloaterconversationpreview.h
# indra/newview/llfloaterdestinations.h
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterjoystick.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llfloaterpay.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterscriptdebug.cpp
# indra/newview/llfloaterscriptdebug.h
# indra/newview/llfloaterscriptedprefs.cpp
# indra/newview/llfloatersearch.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatertools.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llmediactrl.h
# indra/newview/llmoveview.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/llnotificationlistitem.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroupnotices.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelobject.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llpanelpermissions.h
# indra/newview/llpanelprofileclassifieds.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelsnapshot.h
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotlocal.cpp
# indra/newview/llpanelsnapshotpostcard.cpp
# indra/newview/llpreviewnotecard.h
# indra/newview/llstartup.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/llstatusbar.h
# indra/newview/llsyswellwindow.h
# indra/newview/lltexturectrl.h
# indra/newview/lltoolbarview.cpp
# indra/newview/lltoolselect.cpp
# indra/newview/llwearableitemslist.cpp
|
2024-02-21 13:07:42 +01:00 |
|
Ansariel
|
a5261a5fa8
|
Convert BOOL to bool in llui
|
2024-02-21 03:00:25 +02:00 |
|
Ansariel
|
210f59a923
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderview.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llstatbar.cpp
# indra/llui/lltabcontainer.h
# indra/llwindow/lldxhardware.cpp
# indra/llwindow/lldxhardware.h
# indra/llwindow/llkeyboard.cpp
# indra/llwindow/llkeyboard.h
# indra/llwindow/llkeyboardheadless.cpp
# indra/llwindow/llkeyboardheadless.h
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowsdl.cpp
# indra/llwindow/llwindowsdl.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/llavatarlist.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llchiclet.cpp
# indra/newview/llfasttimerview.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloaterbvhpreview.cpp
# indra/newview/llfloatermap.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltoolcomp.cpp
# indra/newview/lltoolcomp.h
# indra/newview/lltoolface.cpp
# indra/newview/lltoolfocus.h
# indra/newview/lltoolpie.cpp
|
2024-02-18 16:22:54 +01:00 |
|
Ansariel
|
c285f59ce2
|
Replace BOOL with bool in llwindow and dependent classes
|
2024-02-18 15:51:54 +02:00 |
|
Ansariel
|
a829354551
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
|
2022-06-15 09:30:07 +02:00 |
|
Beq
|
16b63a990e
|
Allow user to configure LOD suffixes to suit their workflow.
|
2022-06-05 22:26:52 +01:00 |
|
Ansariel
|
5cdd8cdb6e
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
|
2022-05-26 11:43:21 +02:00 |
|
Andrey Lihatskiy
|
91606c7b60
|
Merge branch 'master' into DRTVWR-548-maint-N
|
2022-05-26 03:07:05 +03:00 |
|
Ansariel
|
ef88337eef
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
|
2022-03-02 10:12:19 +01:00 |
|
Andrey Kleshchev
|
97a103255e
|
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
|
2022-03-01 13:41:42 +02:00 |
|
Howard Stearns
|
130d0c0704
|
Merge branch 'master' of bitbucket.org:lindenlab/viewer into SL-9749
|
2022-02-28 15:54:23 -08:00 |
|
Howard Stearns
|
ab39432109
|
SL-9748 - Option to compute uploaded mesh physics shape from a cube.
|
2022-02-22 09:47:43 -08:00 |
|
Andrey Kleshchev
|
38e77cb958
|
SL-16614 Viewer's uploader crash with RenderGLCoreProfile
|
2022-01-12 20:01:36 +02:00 |
|
Andrey Kleshchev
|
7235d333ea
|
DRTVWR-542 Fix incorect dropbox state
|
2021-08-04 00:15:49 +03:00 |
|
Andrey Kleshchev
|
021cf914af
|
SL-15159 Removed dead yet expensive code
"prim_cost" and "description_label" do not appear to be in use, other cost data not in use
|
2021-05-04 23:59:02 +03:00 |
|
Andrey Kleshchev
|
777e896ee4
|
DRTVWR-482 Use proper reshape procedure and fix hidden borders
|
2020-08-11 21:28:05 +03:00 |
|
Mnikolenko Productengine
|
70fe69ea43
|
SL-13189 Mesh uploader - Autofill from _postfixes
|
2020-05-12 19:02:48 +03:00 |
|
Andrey Kleshchev
|
4ac08f1ac5
|
SL-13123 Cleanup
|
2020-04-25 15:12:53 +03:00 |
|
Andrey Kleshchev
|
aa014a65e7
|
SL-13123 Bind shape matrix orientation warning is misbehaving
|
2020-04-24 20:51:07 +03:00 |
|
Andrey Kleshchev
|
9221c8a3f6
|
SL-13080 Changes for joint listings in mesh uploader
|
2020-04-23 20:51:06 +03:00 |
|
Andrey Kleshchev
|
2b459cc80e
|
SL-13078 Split LLModelPreview and LLFloaterModelPreview into separate files
|
2020-04-22 20:02:39 +03:00 |
|
Andrey Kleshchev
|
3ab32456a0
|
SL-307 ImporterDebug is now logged into in-viewer log
|
2020-04-15 15:40:49 +03:00 |
|
Andrey Lihatskiy
|
8a63012054
|
SL-10642 LLModelPreview logging fix
|
2020-04-15 08:42:05 +03:00 |
|
Andrey Kleshchev
|
3c2f3edb5f
|
SL-379 Render selected joint yellow when Avatar tab is open
|
2020-03-31 15:40:48 +03:00 |
|
Andrey Kleshchev
|
acb6e12135
|
SL-379 Remake Overrides tab into Avatar
|
2020-03-30 19:42:46 +03:00 |
|
Andrey Kleshchev
|
46c76eabb8
|
SL-379 Do not disable tabs
|
2020-03-30 15:19:21 +03:00 |
|
Andrey Lihatskiy
|
e66e31f380
|
post-merge buildfix
|
2020-02-22 19:26:09 +02:00 |
|
Andrey Lihatskiy
|
75bd1bcd12
|
Merge branch 'master' into DRTVWR-482
|
2020-02-22 18:51:29 +02:00 |
|
Andrey Kleshchev
|
6a3cb73009
|
SL-379 Joint overrides tab
|
2020-02-10 18:29:52 +02:00 |
|
Andrey Kleshchev
|
67b908cd20
|
SL-379 WIP Joint overrides tab
|
2020-02-07 21:17:34 +02:00 |
|
andreykproductengine
|
c5859778bc
|
SL-379 WIP Joint overrides tab
|
2020-01-17 21:08:38 +02:00 |
|
andreykproductengine
|
5c7b0dfe84
|
SL-304 [Mesh Uploader] A bit of cleanup (parse warnings, missing items, cleanup log)
|
2019-11-28 20:23:22 +02:00 |
|
andreykproductengine
|
1840868178
|
SL-304 [Mesh Uploader] Localization support for logs, better warnings for joints
|
2019-11-27 20:34:26 +02:00 |
|
AndreyL ProductEngine
|
4921618390
|
Merged in lindenlab/viewer-release
|
2019-09-10 23:30:52 +03:00 |
|
andreykproductengine
|
48e282947f
|
SL-11986 Mesh Uploader does not report Upload cost on fee-failure
|
2019-10-15 17:25:26 +03:00 |
|
andreykproductengine
|
580b35c8ea
|
SL-307 Display in-viewer all warning messages logged by the mesh uploader
|
2019-04-01 20:22:25 +03:00 |
|
maxim_productengine
|
4a0ebfad42
|
SL-10611 FIXED Unable to pan the mesh model with 'ctrl + shift + mouse drag' in the preview window when 'Weights' is ticked
|
2019-02-27 17:17:44 +02:00 |
|
maxim_productengine
|
a988b230c2
|
SL-10328 FIXED Some parameters are not reset in the Upload Model menu when pressing button 'Clear settings & reset form'
|
2019-02-13 16:55:22 +02:00 |
|
AndreyL ProductEngine
|
3b932c27b7
|
SL-10288 Mesh uploader changes from Firestorm
|
2019-01-03 00:35:38 +02:00 |
|
andreykproductengine
|
99ab1ccf93
|
SL-4186 Mesh model rename before upload shows old model name on rez
|
2019-05-02 23:06:59 +03:00 |
|
AndreyL ProductEngine
|
599e081815
|
Backed out changeset: d5795c04fecc
|
2019-02-23 20:08:03 +02:00 |
|
AndreyL ProductEngine
|
54b444c5d5
|
Backed out changeset: d531bea24d6e
|
2019-02-23 20:05:15 +02:00 |
|
maxim_productengine
|
00a6c069f2
|
SL-10328 FIXED Some parameters are not reset in the Upload Model menu when pressing button 'Clear settings & reset form'
|
2019-02-13 16:55:22 +02:00 |
|
AndreyL ProductEngine
|
efa5f24d1b
|
SL-10288 Mesh uploader changes from Firestorm
|
2019-01-03 00:35:38 +02:00 |
|
Brad Payne (Vir Linden)
|
791979c553
|
SL-928 - in mesh upload, warn if bind shape is non-identity and skin weights are enabled.
|
2018-08-08 13:34:02 +01:00 |
|
andreykproductengine
|
5219e6c455
|
MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not choose the save directory files within the first minute
|
2018-04-17 19:25:28 +03:00 |
|
AndreyL ProductEngine
|
2abd0eef41
|
Merged in lindenlab/viewer-release
DRTVWR-412 Bento (avatar skeleton extensions)
|
2016-12-05 21:51:29 +02:00 |