Andrey Lihatskiy
|
5d7a5001b4
|
Merge commit '9e24b30' into marchcat/maint-c/restore
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/llfolderviewitem.h
# indra/llui/llfolderviewmodel.h
# indra/llui/llmodaldialog.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llagent.cpp
# indra/newview/llagentcamera.h
# indra/newview/llavatarrenderinfoaccountant.cpp
# indra/newview/llconversationmodel.h
# indra/newview/llfloaterinventorysettings.cpp
# indra/newview/llfloaternamedesc.cpp
# indra/newview/llfloaternamedesc.h
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llfolderviewmodelinventory.h
# indra/newview/llinspecttexture.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorygallery.h
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmaterialeditor.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llreflectionmap.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llteleporthistorystorage.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltexturefetch.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/tests/llviewerassetstats_test.cpp
|
2025-04-10 06:01:50 +03:00 |
|
Andrey Kleshchev
|
37dcb67d42
|
viewer#2338 Don't allow pasting into library from My Environments
|
2024-08-20 18:27:29 +03:00 |
|
Andrey Lihatskiy
|
c95b4bf3ea
|
Post-merge - trim trailing whitespace
|
2024-06-10 20:45:59 +03:00 |
|
Andrey Lihatskiy
|
e592164436
|
Merge branch 'main' into release/maint-c
# Conflicts:
# indra/llui/lltexteditor.cpp
# indra/newview/llcontrolavatar.cpp
|
2024-05-15 12:27:46 +03: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 |
|
Andrey Kleshchev
|
505ed20da3
|
viewer#1216 Library settings can be deleted via My Environments
|
2024-04-17 00:22:33 +03:00 |
|
Andrey Kleshchev
|
be1f3220b9
|
viewer#1215 My Environments' trash button is missing a notification
|
2024-04-16 01:01:19 +03:00 |
|
Andrey Kleshchev
|
d7614a89b6
|
viewer#1213 My Environments 'Apply' buttons enabled for folders
|
2024-04-15 23:54:42 +03:00 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Ansariel
|
a5261a5fa8
|
Convert BOOL to bool in llui
|
2024-02-21 03:00:25 +02:00 |
|
Lars Næsbye Christensen
|
2b31dad400
|
miscellaneous: BOOL (int) to real bool
|
2024-02-12 23:17:22 +02:00 |
|
Rider Linden
|
1f656735d3
|
SL-11705, SL-11706: New flags in llsettings base for tracking by simulator.
|
2019-08-26 11:43:45 -07:00 |
|
Graham Linden
|
24acb7d5c3
|
Fix some line-endings to be newline only.
|
2019-05-03 14:58:51 -07:00 |
|
maxim_productengine
|
89884ed146
|
SL-11057 Revert SL-10893 change to restore "Show All Folders"
|
2019-05-02 12:58:48 +03:00 |
|
maxim_productengine
|
3259851881
|
SL-10983 [EEP] Add a search box to the "My Environments" floater
|
2019-04-18 17:35:28 +03:00 |
|
maxim_productengine
|
66aa3d390d
|
SL-10893 Remove "Show Empty Folders" option
|
2019-04-08 15:26:59 +03:00 |
|
andreykproductengine
|
00d8caa359
|
SL-10279 Finalize drag and drop support
|
2019-01-10 22:11:11 +02:00 |
|
maxim_productengine
|
d66012f85e
|
SL-9716 [EEP] "Use Shared Environment" does not enable when applying an environment to a parcel or region
|
2018-11-30 17:48:08 +02:00 |
|
Rider Linden
|
51772e6083
|
SL-9886: Viewer send and receive new day_name(s) information in the environment protocol for viewer specified names on individual tracks.
|
2018-11-02 09:17:19 -07:00 |
|
maxim_productengine
|
e010203d76
|
MAINT-9080 Edit, Copy, Copy UUID options greyed out in My Environments floater
|
2018-09-05 16:41:23 +03:00 |
|
Rider Linden
|
bb836fcdec
|
Should have been an empty capture for noop lambdas.
|
2018-07-19 13:40:47 -07:00 |
|
Graham Linden
|
31aa86b703
|
Compile fixes for latest Xcode on OSX.
|
2018-07-19 21:11:23 +01:00 |
|
Rider Linden
|
294793b9a9
|
MAINT-8821: Tighten up floater. Allow apply from gear menu.
|
2018-07-10 15:15:47 -07:00 |
|
Rider Linden
|
26b6cc5160
|
MAINT-8821: Clean up some of the selection and enable/disable code, Add menu for adding settings.
|
2018-07-09 17:06:24 -07:00 |
|
Rider Linden
|
a4137d72eb
|
MAINT-8821: New "My Environments" floater. First pass.
|
2018-07-03 14:18:24 -07:00 |