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

154 Commits (962be69e7170a9f7e8a99b9da4eae22ea6cdb038)

Author SHA1 Message Date
Ansariel db72dc7d0f Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-02 19:33:18 +02: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
Ansariel caf7f6c1d2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 17:53:39 +01:00
Ansariel a4f2801b91 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2020-10-15 13:52:10 +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
Ansariel 0007ff2660 Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-07 12:29:58 +02: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
Ansariel dbf00cf036 Merge branch 'master' 2020-04-23 17:40:31 +02:00
Ansariel 22ac7edd6e FIRE-20414 / FIRE-29342: Add option to protect folders from getting moved or deleted 2020-04-14 17:03:26 +02:00
Ansariel 0b6b4c7097 Merge Firestorm LGPL 2019-11-15 19:05:26 +01:00
Dave Houlton dc1453af9c Merge in from viewer-release 6.3.5 2019-11-13 16:46:27 -07:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
Ansariel f8ad1551b3 Merge viewer-eep 2019-02-10 13:12:23 +01:00
andreykproductengine c8d8414b3b SL-10509 EEP Settings Picker gets closed by drag&drop 2019-02-08 19:06:20 +02:00
Tonya Souther 2e644b4911 Compile fixes for Xcode 9 (and probably gcc). 2018-01-27 02:02:16 -06:00
Ansariel 963e699a3c Fix layout issue of inventory item bounding box if folder item height differs from default 2018-01-13 15:59:44 +01:00
Ansariel 4f0220e0fa Slightly dim label suffixes in inventory and fix misleading color name on the way 2017-12-18 21:50:44 +01:00
Ansariel 2347b25808 Merge viewer-neko 2017-06-09 11:49:10 +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
Ansariel cb968152b0 Merge viewer-bear 2016-05-28 14:34:35 +02:00
Ansariel ca98cd73db Back out fix to prevent items going to trash during cut&paste - fix from LL is coming in next merge 2016-05-28 13:00:22 +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
Ansariel 2889c5bf40 Merge viewer-bear 2016-05-09 17:24:00 +02: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
Ansariel 5fe09cb64d Merge Viewer-Bear 2015-08-22 03:13:17 +02:00
andreykproductengine f94a19e09e Merge downstream code and become version 3.8.3 2015-08-04 16:45:49 +03:00
Ansariel fbbc02003d Merge Firestorm tip 2015-07-20 12:35:36 +02: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
Ansariel ebf54d4b2d Merge with Viewer-VMM 2015-07-15 14:23:19 +02: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
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Merov Linden 9ba10bf1f2 Merge lindenlab/viewer-tools-update 2015-03-16 09:49:57 -07:00
andreykproductengine 2e62e7576e MAINT-5274 Missing folder arrow 2015-06-22 19:26:28 +03:00
Oz Linden 6f3cf79a3a merge changes for 3.7.24-release 2015-01-13 13:46:45 -05:00
Merov Linden b0f590f6ab Pull merge from lindenlab/viewer-release 2014-12-19 06:00:48 -08:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
Ansariel e52d57cba2 Merge LL V3.7.23 2015-01-15 15:44:43 +01:00
Merov Linden 4b80a5ed05 Pull merge from lindenlab/viewer-release 2014-09-28 21:40:32 -07:00
andreykproductengine 23e2dcce9d fixing merge conflicts 2014-08-21 20:59:48 +03:00
Merov Linden d37c294bd3 DD-75 : Prevent dropping on filtered tabs root. Adding an allow_drop option to inventory tab and folder view folders so that case can be taken into account. 2014-07-30 20:51:18 -07:00
andreykproductengine f1c43f14b3 MAINT-4218 Adding clothing from inventory closes THAT clothing folder and hides THAT folder 
fixed issue with 'yet to be started filter' and 'dirty-visible' item.
 2014-07-30 18:39:50 +03:00
andreykproductengine 21a0ea1209 MAINT-4218 Adding clothing from inventory closes THAT clothing folder and hides THAT folder 
fixed issue with 'yet to be started filter' and 'dirty-visible' item.
 2014-07-30 18:39:50 +03:00