livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
52,259 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

292 Commits (d65de99052d5ff08c7c4290a1f1b8e396105b8af)

Author SHA1 Message Date
Rye Mutt 4b543b618b Cache more frequently accessed settings 2024-07-24 15:05:08 -04:00
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
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 c285f59ce2 Replace BOOL with bool in llwindow and dependent classes 2024-02-18 15:51:54 +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
RunitaiLinden 1fe76ad0b9 SL-20149 Potential fix for crash when unsitting on a reflection probe. Also fix for assertion in lltexturefetch. 2023-10-18 14:54:07 -05: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
Andrey Kleshchev a53d111cfa SL-15039 Prune unused preferences #2 
List of removed preferences (usused per statistics):
BottomPanelNew
BrowserHomePage
BlockSomeAvatarAppearanceVisualParams
ButtonHPad
ButtonHeight
ButtonHeightSmall
CacheNumberOfRegionsForObjects
ChatBarStealsFocus
ChatLoadGroupTimeout
ChatPersistTime
ChatShowTimestamps
ContextConeInAlpha
ContextConeOutAlpha
ContextConeFadeTime
ConversationHistoryPageSize
ContactsTornOff
CurlMaximumNumberOfHandles
CurlUseMultipleThreads
CustomServer
DebugShowPrivateMem
 2023-09-22 19:28:23 +03:00
Andrey Kleshchev d00b6e4216 SL-15039 Prune unused preferences #1 
List of removed preferences (usused per statistics):
AdvanceOutfitSnapshot
AnimationDebug
AskedAboutCrashReports
AudioLevelDoppler
AudioLevelRolloff
AudioLevelUnderwaterRolloff
AudioLevelWind
AutoAcceptNewInventory
AutoLoadWebProfiles
AvatarBacklight
AvatarPickerSortOrder
AvatarPosFinalOffset
AvatarBakedTextureUploadTimeout
AvatarBakedLocalTextureUpdateTimeout
AnimatedObjectsIgnoreLimits
AnimatedObjectsGlobalScale
AvatarBoundingBoxComplexity
StartUpChannelUUID
NearByChatChannelUUID
NotificationChannelUUID
AlertChannelUUID
AssetStorageLogFrequency
AvatarInspectorTooltipDelay
AllowBottomTrayButtonReordering
AvatarRotateThresholdSlow
AvatarRotateThresholdFast
 2023-09-22 19:28:23 +03:00
Maxim Nikolenko 00e7311960
SL-20151 allow right-clicking reflection probes if 'Select Reflection Probes' is enabled 2023-08-16 16:39:50 +03:00
RunitaiLinden b67172aa12 SL-20010 Make reflection probes ignore touch actions. 2023-07-21 15:46:12 -05:00
Brad Linden a548c16989 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-03-29 14:54:06 -07:00
Andrey Kleshchev f60f12d94e SL-19119 Fix mouse steering 2023-02-12 21:52:23 +02:00
Brad Linden fb402f80a8 DRTVWR-559 removing dead code now that RenderHoverGlowEnable is gone. 
see commit e9e37aa2ad for details.
 2023-02-06 11:34:05 -08:00
Dave Parks 830cb6b665 SL-19148 Decruft some forward shaders and drawpools. Fix HUDs being in wrong color space. 2023-02-03 17:18:39 -06:00
Dave Parks e9e37aa2ad SL-18784 Refactor physics shape display to not require its own render target. Remove "Hover Glow Objects" to free up a superfluous render target. 2022-12-06 16:15:27 -06:00
Brad Payne (Vir Linden) 3994101549 SL-18119 - more ViewerStats logs for NUX 2022-09-21 20:52:27 +01:00
Mnikolenko Productengine 76a1b181e6 SL-16970 FIXED Crash in LLToolPie::teleportToClickedLocation 2022-03-03 16:40:00 +02:00
Andrey Lihatskiy 73eec89131 Merge branch 'master' into DRTVWR-540-maint 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llfloatereditextdaycycle.cpp
 2022-02-28 21:54:21 +02:00
Andrey Kleshchev ce6dd53f9c SL-16564 'Click to' action 'None' doesn't work as intended #2 2022-02-15 14:45:17 +02:00
Andrey Kleshchev 921fe18f8b SL-16564 'Click to' action 'None' doesn't work as intended 
There shouldn't be any differences for 'None' between normal objects and attachments
 2022-02-15 14:45:13 +02:00
Andrey Lihatskiy 0bef5e553e Revert "SL-14717 Ability to trigger left clicks (and more) on animesh objects" 
This reverts commit 8215fff0c2.

# Conflicts:
#	indra/newview/lltoolpie.cpp
 2022-01-21 19:13:28 +02:00
Andrey Lihatskiy 469ce7f7f6 Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK 
# Conflicts:
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llkeyconflict.cpp
 2022-01-10 23:51:52 +02:00
Andrey Kleshchev 82a3c185cd SL-16604 Double click teleport should ignore clicking own nametag 2022-01-06 23:28:36 +02:00
Andrey Kleshchev bc78cf0b51 SL-16604 Double click teleport should ignore clicking yourself 2022-01-06 21:55:25 +02:00
Andrey Kleshchev ee2d618706 SL-16564 'Click to' action 'None' doesn't work as intended 
There shouldn't be any differences for 'None' between normal objects and attachments
 2021-12-19 14:01:33 +02:00
Andrey Lihatskiy 49dd88e86c Merge branch 'master' into DRTVWR-540-maint 
# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llviewerinput.cpp
 2021-11-19 04:45:15 +02:00
Andrey Lihatskiy f9373a9b4e Merge branch 'master' into DRTVWR-527-maint 
# Conflicts:
#	autobuild.xml
#	indra/newview/installers/windows/lang_pl.nsi
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llinventorymodel.cpp
 2021-11-16 00:54:53 +02:00
Andrey Kleshchev acf771a47e SL-14457 Resolve click-to-move conflict with SL-14717 2021-10-19 23:12:55 +03:00
Andrey Lihatskiy b18f328c08 Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llmachineid.cpp
 2021-09-03 00:18:26 +03:00
Andrey Lihatskiy 6c8e6f033b Merge branch 'master' into DRTVWR-521-maint 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llerror.cpp
#	indra/llui/llnotifications.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewermacosx.cpp
 2021-07-20 02:48:05 +03:00
Andrey Lihatskiy 3e85f6a8c9 Merge branch 'master' into DRTVWR-540-maint 2021-07-19 22:22:58 +03:00
Andrey Lihatskiy 9873e7bba9 Merge branch 'master' into DRTVWR-527-maint 2021-07-19 22:22:32 +03:00
Andrey Lihatskiy 2ded530f93 Merge branch 'master' into DRTVWR-522-maint 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llappcorehttp.cpp
#	indra/newview/llappcorehttp.h
 2021-07-19 22:20:45 +03:00
Andrey Kleshchev 0814ba3322 SL-443 Keybindings: Support reassigment of script interaction button 2021-07-15 18:50:44 +03:00
Andrey Lihatskiy 8215fff0c2 SL-14717 Ability to trigger left clicks (and more) on animesh objects 
Contribution by Rohacan Hirons

SL-14717 Follow ups

SL-14717 Using the cached setting in LLToolPie::handleHover()
 2021-04-06 23:24:38 +03:00
Ansariel 5ab76453bb Fix merge errors 2021-04-05 20:52:49 +02:00
Andrey Lihatskiy b52384d9ef Merge branch 'master' into DRTVWR-522-maint 
# Conflicts:
#	indra/newview/lltoolpie.cpp
 2021-04-01 20:49:26 +03:00
Andrey Lihatskiy e355f47d28 Merge branch 'master' into DRTVWR-521-maint 2021-04-01 20:48:28 +03:00
Andrey Lihatskiy 9fe758e8bc Merge branch 'master' into DRTVWR-516-maint 2021-04-01 20:45:16 +03:00
Andrey Kleshchev 9407637c53 SL-14461 Double click teleport should work on 'disabled' objects 2020-12-13 13:06:47 +02:00
Andrey Kleshchev 9dd9af129b SL-14461 Parent set to no click action should not override child's 'touch' action. 2020-12-11 23:07:49 +02:00
Mnikolenko Productengine e3b910e141 SL-14462 FIXED The wrong mouse cursor is shown when sitting on a touch-scripted object 2020-12-04 17:02:22 +02:00
Mnikolenko Productengine 4de5f6a853 SL-14455 FIXED Drag ground to turn is still active when Single click on land is set to No action 2020-12-03 17:10:50 +02:00
Andrey Kleshchev 0812d81e7b SL-13287 Removed unused hack 2020-11-16 22:11:35 +02:00
Andrey Lihatskiy 83822fd199 Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/newview/llvocache.cpp
 2020-09-28 22:39:06 +03:00
Andrey Kleshchev 42fa322e76 Merged master (DRTVWR-497) into DRTVWR-514-keymappings 2020-09-28 21:21:13 +03:00