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

140 Commits (4c2d4e32addd95dedf01acf254db9b41b0813fdb)

Author SHA1 Message Date
Andrey Lihatskiy 6d077c90a0 Merge branch 'main' into DRTVWR-588-maint-W 2024-03-01 17:30:06 +02:00
Alexander Gavriliuk ae91ae43a5 SL-20795 Part of previously typed emojis disappear in the 'Save settings as a preset...' option of the 'Preferences' floater 2024-01-17 04:34:21 +01:00
Alexander Gavriliuk e7f1466a7b Merge branch main into DRTVWR-489 2023-10-08 14:01:05 +02:00
Andrey Lihatskiy 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
Andrey Kleshchev 7373fd91fa Merge remote-tracking branch 'origin/main' into DRTVWR-489 
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llmath/llvolume.cpp
#	indra/llrender/llgl.cpp
#	indra/llxml/llcontrol.cpp
#	indra/newview/llpanelnearbymedia.cpp
#	indra/newview/llsceneview.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 2023-08-24 01:23:52 +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
Andrey Lihatskiy eca82d7308 Merge branch 'main' into DRTVWR-588-maint-W 2023-08-23 22:29:40 +03:00
Andrey Kleshchev 226a0025e9 SL-20182 dirtyFilter crash while accessing parent 2023-08-22 00:46:34 +03:00
Andrey Kleshchev c4c5778b26 SL-20098 handleDoubleClick crashes in new inventory panels 2023-08-02 18:02:37 +03:00
Callum Prentice c5d7f3c4c1 DRTVWR-489: trivial merge conflict fix 2023-07-18 10:51:51 -07:00
Andrey Kleshchev bc3f2d53d1 SL-19891 Make sure focusable elements clear focus on destruction 2023-07-18 01:56:42 +03:00
Andrey Kleshchev acf82867b6 Merge branch 'main' (DRTVWR-580) into DRTVWR-567 
# Conflicts:
#	indra/llui/llfolderviewitem.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventorymodelbackgroundfetch.cpp
 2023-07-17 23:34:59 +03:00
Maxim Nikolenko 505c15cf47 SL-19759 FIXED Adding New Folders in Single Folder view can cause all folders to open and shift out of view 2023-05-23 16:13:10 +03:00
Andrey Kleshchev 706d8f1727 SL-19732 Fix folder's thumbnail from sticking over folder's content 2023-05-18 22:22:16 +03:00
Maxim Nikolenko 474012abd6 SL-19686 reduce delay when switching between folders 2023-05-16 18:03:57 +03:00
Alexander Gavriliuk f5adfae1ad SL-19099 The long name of the item is out of bounds on the Editing Tools/Content tab 2023-03-19 05:08:04 +01:00
Maxim Nikolenko 3c54d6a037 SL-19386 Double click to open Single folder view should affect only Inventory 2023-03-13 12:42:08 +02:00
Maxim Nikolenko b142219667 SL-19288 Change item label suffix color to grey 2023-03-01 21:30:42 +02:00
Maxim Nikolenko f377e27f0b SL-19274 Add new double-click option to Inventory settings 2023-02-27 20:27:11 +02:00
Maxim Nikolenko 49da5288bd SL-19234 add Inventory settings floater 2023-02-24 03:17:53 +02:00
Maxim Nikolenko 734b1b5d42 SL-19105 WIP Single-folder inventory view 2023-02-17 16:23:44 +02:00
Maxim Nikolenko 2d6edb088e SL-19149 Highlight string match is misplaced when searching worn items 2023-02-03 22:22:11 +02:00
Maxim Nikolenko db80fdb55b SL-19104 update label and permissions display 2023-02-01 23:57:36 +02:00
Kitty Barnett 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
Kitty Barnett 7ebaa2d2e5 Merge branch contribution/emoji into DRTVWR-489-emoji 2022-11-09 23:25:02 +01:00
Kitty Barnett 5440464a9c Merge branch 'contribution/emoji' 2022-08-28 00:08:38 +02:00
Andrey Lihatskiy 9873e7bba9 Merge branch 'master' into DRTVWR-527-maint 2021-07-19 22:22:32 +03:00
Andrey Kleshchev 7ddbf118f5 SL-13182 Split buildNewViews over frames 2021-04-01 23:06:44 +03:00
Andrey Kleshchev 65352e9884 SL-14927 Some avatar names not resolving in chat 2021-03-19 13:47:32 +02:00
Andrey Kleshchev 5f6a025397 Revert "SL-14927 Some avatar names not resolving in chat" 
This reverts commit a66932a091.
 2021-03-19 13:40:19 +02:00
Andrey Kleshchev a66932a091 SL-14927 Some avatar names not resolving in chat 
buildConversationViewParticipant() was deparenting view models that belong to session
 2021-03-19 13:22:05 +02:00
Andrey Lihatskiy fb1238a1ce Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.cpp
#	indra/newview/llenvironment.cpp
 2020-11-13 18:26:56 +02:00
Mnikolenko Productengine 0b395f01f9 SL-13570 FIXED The name of the item is overlapped by search term in inventory 2020-09-30 14:25:21 +03:00
Andrey Kleshchev 8576eaa3bf SL-13119 Fixed label updates 2020-05-07 00:07:29 +03:00
Andrey Kleshchev 59433e3132 SL-13119 Made control settings cached and fixed potential filtering issue 2020-04-30 16:32:16 +03:00
Andrey Kleshchev d70b749101 SL-13119 Moved ineffective function from inventory view creation 2020-04-29 21:55:40 +03:00
Dave Houlton dc1453af9c Merge in from viewer-release 6.3.5 2019-11-13 16:46:27 -07:00
Kitty Barnett 418308bc7c Characters can have more than one representation in LLFontFreetype 
* By default all viewer text will use B/W glyphs
  * Added temporary use_color attribute to LLTextBase for testing
 2019-11-06 12:34:26 +01:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
andreykproductengine c8d8414b3b SL-10509 EEP Settings Picker gets closed by drag&drop 2019-02-08 19:06:20 +02:00
Kitty Barnett d7edeb2df8 STORM-2149: Add a warning notification when deleting a folder of filtered content 2017-06-02 16:44:00 +02:00
andreykproductengine f3507631ea linux build fix 2016-05-26 18:26:43 +03:00
andreykproductengine 7d54c62016 MAINT-6397 cut items should not go to trash 2016-05-25 20:37:52 +03:00
Mnikolenko Productengine e5048ad8b2 MAINT-6302 FIXED Inventory tree indention displays incorrectly when dragging an open folder into another folder 2016-04-14 13:06:44 +03:00
andreykproductengine f94a19e09e Merge downstream code and become version 3.8.3 2015-08-04 16:45:49 +03:00
andreykproductengine 7cd62f4908 MAINT-5274 Missing folder arrow 2015-06-22 19:26:28 +03:00
Merov Linden a82d1242d8 DD-410 : Do not extend inventory selections to items that are not visible 2015-06-11 16:51:24 -07:00
andreykproductengine bcf5b196fe MAINT-5205 FIXED ‘Share’ button isn't disabled when worn item and few not worn items are selected 2015-05-12 22:03:06 +03:00
Merov Linden 9ba10bf1f2 Merge lindenlab/viewer-tools-update 2015-03-16 09:49:57 -07:00
Oz Linden 6f3cf79a3a merge changes for 3.7.24-release 2015-01-13 13:46:45 -05:00