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

78 Commits (6ed99747750685c8a34d595a0c516bbeeeed4299)

Author SHA1 Message Date
RunitaiLinden e279aae51a #1597 Fix for some GLTF transforms not loading properly. 
Also incidental fix for unreachable code error.
 2024-05-30 13:42:27 -05: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 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 Lihatskiy 878fb36a0b Merge branch 'main' into DRTVWR-591-maint-X 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/llvovolume.cpp
 2023-10-03 19:55:49 +03:00
Andrey Kleshchev 7d50a51434 Merge branch 'main' (DRTVWR-567) into DRTVWR-559 
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llagent.cpp
#	indra/newview/llfloaternewfeaturenotification.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llsidepaneltaskinfo.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewertexturelist.h
#	indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
#	indra/newview/skins/default/xui/en/menu_inventory.xml
 2023-10-03 19:00:33 +03:00
Andrey Kleshchev bcfd5d5279 SL-20367 Switch from index to value based selection 
To make sure it won't happen again once new option gets added
 2023-10-02 21:57:12 +03:00
Andrey Kleshchev 4b74b82f8d SL-20367 Click actions Zoom and Ignore can't be set from object's profile 2023-10-02 15:43:37 +03:00
Andrey Kleshchev 71a02a8d35 SL-20242 UI overlap in object profile with DebugPermissions on 2023-08-30 22:26:58 +03:00
Andrey Kleshchev 3d73a10da3 Merge branch main (DRTVWR-582) into DRTVWR-567 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/llinventoryobserver.h
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
 2023-08-23 22:40:17 +03:00
Brad Linden c6d5f11f63 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-08-23 12:26:14 -07:00
Alexander Gavriliuk 834a8eedde SL-19728 Objects that cannot be clicked or cammed unless in edit mode 2023-07-11 23:55:46 +02:00
Andrey Kleshchev 7a99ce16d1 SL-19109 Turn LLSidepanelTaskInfo into a normal panel 2023-02-04 19:54:23 +02:00
Andrey Kleshchev 89625f9247 SL-18444 Live Material Editor updating with selection 2022-10-26 00:41:59 +03:00
andreykproductengine 126b138440 SL-11472 Checkboxes continue to change their state after clicking is stopped in the "Item profile" menu 2019-07-08 21:08:17 +03:00
andreykproductengine 5f890af707 MAINT-8731 Click action to disable clicking objects, per-object in a linkset 2018-06-13 20:28:26 +03:00
Andrey Kleshchev 9eabb2797e MAINT-8586 XUI cleanup 2018-05-08 12:42:35 +00:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
Mnikolenko ProductEngine 405bae78cd MAINT-5971 FIXED Creator and Owner are missing in Object profile 2015-12-17 12:30:19 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Mnikolenko ProductEngine 7ae4837b52 MAINT-1412 FIXED Don't update creator/owner name if it stays the same. 2015-07-08 14:07:47 +03:00
Mnikolenko ProductEngine b07bfba198 MAINT-4691 FIXED Changed text labels 2014-11-26 13:32:43 +02:00
Mnikolenko ProductEngine a500cd62ec MAINT-4691 Restored price labels in Object profile panel 2014-11-25 12:06:13 +02:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
maksymsproductengine e6c85c46c4 MAINT-3555 crash in LLPanel::~LLPanel() on shutdown: 
- memory leaks fixing;
 2014-02-05 20:45:09 +02:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
dmitrykproductengine 5eba8063a7 MAINT-2175 FIXED 'Pay Resident' floater is not opened after clicking on 'Pay' button in Object profile 2013-08-12 21:42:52 +03:00
Richard Linden e340009fc5 second phase summer cleaning 
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
 2013-08-09 17:11:19 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Richard Linden 41b4374760 SH-3931 WIP Interesting: Add graphs to visualize scene load metrics 
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect
standard naming conventions for handlers vs. reactors
 2013-05-10 17:57:12 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 68f9f656cd merge with viewer-release 2013-03-22 00:44:59 -07:00
Nyx Linden 11fe124ae9 merging in viewer-beta. 
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
 2013-01-24 16:22:49 -05:00
Richard Linden a52d203a4f SH-3405 WIP convert existing stats to lltrace system 
started conversion of llviewerassetstats
removed old, dead LLViewerStats code
made units tracing require units declaration
clean up of units handling
 2012-10-17 20:00:07 -07:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Dave Parks 7aca8ad6b8 MAINT-1534 Fix for calls to find widgets getting out of hand. 2012-09-11 15:55:36 -05:00
Todd Stinson bec4708fba Adding the pathfinding attributes to the object profile panel. 2012-07-05 17:54:04 -07:00
Todd Stinson 6e710333e7 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-06-22 18:59:31 -07:00
Todd Stinson f143da27bf PATH-760: Ensuring that the pathfinding attribute field works correctly with multiple objects selected. 2012-06-21 18:03:23 -07:00
Todd Stinson aea6b0c70c PATH-760: Renaming some methods of LLSelectMgr. 2012-06-21 17:29:12 -07:00
Todd Stinson 379aff3520 PATH-713: Disabling all editable object fields on the build tools floater when a static pathfinding object is in not in the current region. 2012-06-13 16:57:35 -07:00
Todd Stinson fcda925072 PATH-450: BUGFIX Ensuring that permanent objects cannot be linked in frozen mode. Displaying a modal notification if user attempts. 2012-03-29 18:07:40 -07:00
Paul ProductEngine 89cb4c63e8 MAINT-789 FIXED ([PUBLIC]Button "Buy" isn't work in Object profile) 
- Set proper callback for buy button
- Removed dead code
- Fixed values for action combobox in object profile panel
 2012-03-20 18:51:26 +02:00
Leslie Linden 943789b53a SH-2710 FIX -- Removed calls to getChild happening every frame and during idle calls. 
Reviewed by davep.
 2011-11-23 12:11:53 -08:00
Jonathan Yap 1ca028cd7b STORM-812 Make bottom buttons in Object Profile identical for single and multi-prim objects 2010-12-23 17:12:37 -05:00