Ansariel
|
e2e37cced8
|
Fix line endlings
|
2024-05-22 22:40:26 +03:00 |
|
Ansariel
|
1b67dd855c
|
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.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.cpp
# 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/llimpanel.cpp
# indra/newview/llimpanel.h
# 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/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# 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/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
|
2024-05-22 19:04:52 +02:00 |
|
Alexander Gavriliuk
|
f9473e8afc
|
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
|
2024-05-07 10:18:51 +02:00 |
|
Andrey Lihatskiy
|
38c2a5bde9
|
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
|
2024-05-01 08:16:58 +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 |
|
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 |
|
Andrey Lihatskiy
|
27dae1d967
|
Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
|
2023-11-30 13:30:27 +02:00 |
|
Andrey Kleshchev
|
145a5ffe7f
|
SL-15039 Prune unused preferences #3
DebugInventoryFilters
DebugShowXUINames
DebugSlshareLogTag
DebugStat****
DefaultBlankNormalTexture
DefaultObjectNormalTexture
DefaultObjectSpecularTexture
DefaultUploadCost
DisplayAvatarAgentTarget
DisplayChat
DisplayDebug
DisplayDebugConsole
DisplayIM
DisplayLinden
DisplayRegion
DragAndDropToolTipDelay
DragAndDropDistanceThreshold
DropShadowButton
DropShadowFloater
DropShadowSlider
DropShadowTooltip
UIImgWhiteUUID
UseEnvironmentFromRegion
UseDayCycle
WaterPresetName
SkyPresetName
DayCycleName
DestinationGuideHintTimeout
SidePanelHintTimeout
DisablePrecacheDelayAfterTeleporting
|
2023-09-22 19:28:23 +03:00 |
|
Brad Linden
|
5fabfa50d7
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-02-02 12:11:40 -08:00 |
|
Brad Linden
|
eb526fec0a
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2022-12-12 17:59:34 -08:00 |
|
Andrey Lihatskiy
|
f836194516
|
Merge branch 'main' into DRTVWR-570-maint-Q
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloater360capture.cpp
|
2022-12-12 20:53:11 +02:00 |
|
Andrey Kleshchev
|
7c489e0480
|
SL-18648 Clean up unused mNonImmediateFilterPermMask
|
2022-12-01 05:33:48 +02:00 |
|
Rye Mutt
|
d0e07c770b
|
Fix checks for empty LLSD maps to use size and not emptyMap which is for creating an empty LLSDMap type.
|
2022-10-30 06:56:16 -04:00 |
|
Andrey Kleshchev
|
664ce046ee
|
SL-17628 Add viewer sided max attachment distance to position fields
|
2022-09-21 21:54:37 +03:00 |
|
Andrey Lihatskiy
|
a7c9ca8960
|
Merge branch 'master' into DRTVWR-561-maint-O
|
2022-06-29 20:32:13 +03:00 |
|
Andrey Kleshchev
|
48d2836ce6
|
SL-17436 Tools floater drops negative Z position for attachments
|
2022-06-24 22:07:18 +03:00 |
|
Andrey Lihatskiy
|
9a1af101cd
|
Merge branch 'master' into DRTVWR-543-maint
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llvoicevivox.cpp
|
2021-11-19 04:38:19 +02:00 |
|
Andrey Lihatskiy
|
098c4c0371
|
Merge branch 'master' into DRTVWR-486
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llpanelvolume.cpp
# indra/newview/llpanelvolume.h
|
2021-11-16 01:45:17 +02:00 |
|
Mnikolenko Productengine
|
9e4549117d
|
SL-15887 FIXED Using Position buttons on an attachment that has a negative number for any position axii causes global position to be used
|
2021-08-27 17:29:09 +03:00 |
|
Mnikolenko Productengine
|
985502756f
|
SL-14463 Don't show "Taper" prim parameter value when multiple prims are selected
|
2020-12-10 18:10:22 +02:00 |
|
Andrey Kleshchev
|
d95f86c593
|
SL-13359 #7 Features tab
|
2020-06-18 22:38:58 +03:00 |
|
Andrey Kleshchev
|
1310fac3b1
|
SL-13359 #5 Implemented revised changes
|
2020-06-17 23:39:42 +03:00 |
|
Andrey Kleshchev
|
30f1038351
|
SL-13359 #3 UI changes for panel object
|
2020-06-03 16:12:32 +03:00 |
|
Andrey Kleshchev
|
f363646eb7
|
SL-13359 #2 UI changes for panel object
todo: new icons, separator and some repositioning
|
2020-06-02 21:54:47 +03:00 |
|
Andrey Kleshchev
|
090bb3e6de
|
SL-13359 #1 Revert floater_tools and object panel changes
|
2020-06-02 16:58:28 +03:00 |
|
Andrey Lihatskiy
|
f4c7c8aff5
|
Post-merge build fixes
|
2020-04-26 21:15:54 +03:00 |
|
Andrey Lihatskiy
|
e77134ea89
|
Merge branch 'master' into DRTVWR-486
|
2020-03-18 21:07:30 +02:00 |
|
andreykproductengine
|
eaa4e977d6
|
SL-12334 [Copypaste] Texture is not copied to clipboard from a full-perms object
|
2019-12-11 22:48:46 +02:00 |
|
maxim_productengine
|
f67a88314b
|
SL-12290 FIXED [Project Copy/Paste] Checked 'Light' parameter has not become unchecked after Copy/Paste object properties
|
2019-11-18 15:28:49 +02:00 |
|
Brad Payne (Vir Linden)
|
65550520ed
|
SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. Group-related costs and limits via benefits.
|
2019-11-15 15:13:11 +00:00 |
|
andreykproductengine
|
aec6caf5eb
|
SL-12241 Separated 'flexible' paramenters
|
2019-11-08 21:11:48 +02:00 |
|
maxim_productengine
|
3992875627
|
SL-12227 FIXED Copied physics data always applies physics material as Stone.
|
2019-11-05 12:25:23 +02:00 |
|
andreykproductengine
|
baf86263e6
|
SL-12213 Unable to paste no-modify/no-transfer texture
|
2019-11-04 18:24:36 +02:00 |
|
maxim_productengine
|
d3178573bb
|
SL-12156 FIXED [Project Copy/Paste] The prim's shape can be changed by pasting mesh parameters
|
2019-10-18 17:23:28 +03:00 |
|
Kadah_Coba
|
add1462917
|
Merged in andreyl_productengine/486-copypaste
|
2019-10-14 20:44:51 -07:00 |
|
Kadah_Coba
|
ce48cb4303
|
[Project Copy/Paste] Simplified texture copy check
|
2019-10-06 16:09:56 -07:00 |
|
maxim_productengine
|
379b480f0e
|
SL-11944 FIXED [Project Copy/Paste] The prim's shape can be changed by pasting empty parameters
|
2019-10-01 15:44:05 +03:00 |
|
Kadah_Coba
|
733f799c43
|
Cleanup object copy/paste functions
|
2019-09-06 20:46:23 -07:00 |
|
Kadah_Coba
|
43bf63efd0
|
Added translation support for build tools paste buttons tooltips
|
2019-04-17 02:41:33 -07:00 |
|
Kadah_Coba
|
41f5801aae
|
Added spotlight and phantom support to copy/paste
Added paste options menu
|
2019-04-16 03:51:05 -07:00 |
|
Kadah_Coba
|
c45eff54cb
|
Added remaining physical properies to copy/paste
|
2019-04-11 01:49:46 -07:00 |
|
Kadah_Coba
|
3a27acca73
|
Added Copy/Paste object parameters in Build Tools
|
2019-04-09 00:12:04 -07:00 |
|
Kadah_Coba
|
3ee20531c9
|
Added Copy/Paste to object properties in Build Tools
|
2019-04-08 03:05:03 -07:00 |
|
andreykproductengine
|
1e883c5b39
|
MAINT-8844 Fixed selection inconsistancies (inworld manipulation vs tool floater)
|
2018-07-16 17:35:29 +03:00 |
|
andreykproductengine
|
66502df050
|
MAINT-8540 Eliminated a lot of xui related log warnings on startup and opening preferences
|
2018-04-20 20:21:20 +03:00 |
|
andreykproductengine
|
86935443eb
|
MAINT-931 Fixed Sitting avatar's rotation is not updated correctly viewer side
|
2018-02-14 20:17:55 +02:00 |
|
Andrey Kleshchev
|
a148882da4
|
MAINT-2896 Object position grayed out when editing avatar attachments
|
2018-01-23 17:42:15 +00:00 |
|
Mnikolenko Productengine
|
e057efb599
|
MAINT-2047 FIXED Avatar follows the object only once if change object's location in Edit mode
|
2017-09-07 18:13:12 +03:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |