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
7a2070d795
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llscrollingpanelparam.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llvovolume.cpp
2024-04-24 18:59:46 +02:00
0dd4b94ef0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llapp.cpp
# indra/llcommon/llapp.h
# indra/llcommon/llpointer.h
# indra/llimage/llimageworker.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/llui/llkeywords.cpp
# indra/llui/lltabcontainer.cpp
# indra/llui/lltextbase.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfavoritesbar.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llhudnametag.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelvoicedevicesettings.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llscrollingpanelparam.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/xui/en/panel_performance_complexity.xml
# indra/newview/skins/default/xui/en/panel_performance_huds.xml
2024-04-10 12:32:32 +02:00
2474e3ba1d
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
2024-04-10 10:03:37 +02:00
84dfe55810
Merge branch 'main' into marchcat/y-merge
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
2024-04-10 07:08:25 +03:00
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
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
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
c285f59ce2
Replace BOOL with bool in llwindow and dependent classes
2024-02-18 15:51:54 +02:00
e341621a8e
Merge branch 'DRTVWR-594-maint-Y' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llmemory.cpp
# indra/llui/lltooltip.cpp
# indra/newview/llagent.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/notifications.xml
2023-12-27 13:00:20 +01:00
afc08372b1
SL-20537 Add hover-preview for My Outfit list
2023-10-31 23:01:16 +02:00
fde2521319
Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/skins/default/textures/textures.xml
2023-10-04 15:22:25 +02:00
fe039ceabc
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llui/lltooltip.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/skins/default/textures/textures.xml
2023-10-04 13:22:38 +02:00
13f1273c1d
Merge branch 'main' into DRTVWR-588-maint-W
...
# Conflicts:
# indra/llui/lltooltip.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/textures/textures.xml
2023-10-03 19:42:47 +03:00
652e89917e
Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/skins/default/xui/en/floater_stats.xml
2023-08-16 13:30:37 +02:00
5430efbb31
SL-20139 pressing the Tab key should paste tooltip only when hovering functions in LSL editor
2023-08-15 20:38:02 +03:00
2bc4fb2bf0
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/llinventory/llsettingssky.cpp
# indra/llui/llfolderviewitem.cpp
# indra/llui/llview.h
# indra/newview/llaisapi.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterproperties.cpp
# indra/newview/llfloaterproperties.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelmarketplaceinbox.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelinventory.cpp
# indra/newview/llsidepanelinventory.h
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/en/sidepanel_inventory.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
# indra/newview/skins/default/xui/en/sidepanel_task_info.xml
# indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
2023-02-13 23:35:21 +01:00
1140ae3489
Add a texture inspector and show it when hovering over an inventory textory (or folder containing - among others - exactly one texture) and when hovering over notecard embedded textures
2023-02-01 16:38:47 +02:00
14fb8f66f8
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-24 16:34:12 +02:00
0d7f6d917a
SL-13729 Performance of LLUI and LLRender2D #3
2020-09-18 17:27:12 +03:00
a5c8b1cbe2
SL-13729 Performance of LLUI and LLRender2D #2
2020-09-17 20:39:45 +03:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
b4d4aac1c2
SL-9766 [Render] [Mac] Alt + left mouse click has severely impaired functions
...
SL-10019 - [Mac] [Render] Right-click context menu immediately disappears when clicking any place in the ‘Inventory’ floater
SL-9984 - [Retina] Camera frustum, do not display correctly on "WORLD MAP" window.
SL-10027 - [Mac] [Render] Add toggle for Retina support to mitigate FPS loss
Re-FIX for Retina support.
2018-11-26 18:02:44 +02:00
acc86a9139
SL-9766 [Render] [Mac] Alt + left mouse click has severely impaired functions
...
SL-10019 - [Mac] [Render] Right-click context menu immediately disappears when clicking any place in the ‘Inventory’ floater
SL-9984 - [Retina] Camera frustum, do not display correctly on "WORLD MAP" window.
SL-10027 - [Mac] [Render] Add toggle for Retina support to mitigate FPS loss
Re-FIX for Retina support.
2018-11-26 18:02:44 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
dee88bbdf1
group banz
2014-10-13 22:46:05 -07:00
2834c7968d
MAINT-3975 FIX Group Invitation window omits ? button for listed residents (INTEREST LIST RC only)
2014-04-29 14:24:00 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
d122318bef
SH-4299 WIP: Interesting: High fps shown temporarily off scale in statistics console
...
added percentage/ratio units
added auto-range and auto tick calculation to stat bar to automate display stats
2013-07-08 00:55:17 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
c009cf4f76
CHUI-223 WIP Selecting to cut an inventory item causes all open inventory windows to refresh
...
improved filtering behavior that should result in less flashes of emptiness
2012-08-01 19:42:22 -07:00
891af8055a
MAINT-1276: Add ability to paste LSL tooltips into scripts. Reviewed by Kelly
2012-07-17 13:52:08 -07:00
e854db0645
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
...
EXP-1854 FIX Text positioning in mini inspector a couple pixels too low
2012-02-03 19:04:36 -08:00
17c699e428
* Updated flash_color to use old LLButton highlight_color default.
2011-10-05 16:29:12 -07:00
b183b6f141
EXP-1196 FIX Fix param block template ordering
...
changed ordering of template loading relative to constructor setting of params
moved a lot of constructor-set params to template files
reviewed by Leslie
2011-09-06 14:45:11 -07:00
0edb695ea8
instead of exposing mutable container in LLInitParam::Multiple, just expose access functions, begin(), end(), etc.
...
this allows mutation of param block contents, without being able to change number of elements
2010-09-22 14:48:18 -07:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
44e312541a
made favorites button tooltips override parent generic tooltip more consistently
2010-08-19 17:37:12 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
2c722547ea
changed allow_html to parse_urls to be clearer about its meaning
...
allow_html still supported as alternate
2010-07-15 10:20:06 -07:00
e159873eec
added popup panel to hold nearby media popup and stopped using top view
2010-02-12 16:54:47 -08:00
6bce7146e6
CID-338
...
Checker: UNINIT_CTOR
Function: LLToolTipMgr::LLToolTipMgr()
File: /indra/llui/lltooltip.cpp
2010-01-28 10:26:38 -08:00
Ansariel