5f6a025397
Revert "SL-14927 Some avatar names not resolving in chat"
...
This reverts commit a66932a091
2021-03-19 13:40:19 +02:00
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
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
0b395f01f9
SL-13570 FIXED The name of the item is overlapped by search term in inventory
2020-09-30 14:25:21 +03:00
8576eaa3bf
SL-13119 Fixed label updates
2020-05-07 00:07:29 +03:00
59433e3132
SL-13119 Made control settings cached and fixed potential filtering issue
2020-04-30 16:32:16 +03:00
d70b749101
SL-13119 Moved ineffective function from inventory view creation
2020-04-29 21:55:40 +03:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
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
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
c8d8414b3b
SL-10509 EEP Settings Picker gets closed by drag&drop
2019-02-08 19:06:20 +02:00
d7edeb2df8
STORM-2149: Add a warning notification when deleting a folder of filtered content
2017-06-02 16:44:00 +02:00
f3507631ea
linux build fix
2016-05-26 18:26:43 +03:00
7d54c62016
MAINT-6397 cut items should not go to trash
2016-05-25 20:37:52 +03:00
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
f94a19e09e
Merge downstream code and become version 3.8.3
2015-08-04 16:45:49 +03:00
7cd62f4908
MAINT-5274 Missing folder arrow
2015-06-22 19:26:28 +03:00
a82d1242d8
DD-410 : Do not extend inventory selections to items that are not visible
2015-06-11 16:51:24 -07:00
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
9ba10bf1f2
Merge lindenlab/viewer-tools-update
2015-03-16 09:49:57 -07:00
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
b0f590f6ab
Pull merge from lindenlab/viewer-release
2014-12-19 06:00:48 -08:00
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
4b80a5ed05
Pull merge from lindenlab/viewer-release
2014-09-28 21:40:32 -07:00
23e2dcce9d
fixing merge conflicts
2014-08-21 20:59:48 +03:00
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
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
0ea34fba73
MAINT-4289 FIXED [BEAR] Recent Items "Reset Filters" not working correctly
...
reverted and remade MAINT-4218
2014-07-29 17:55:06 +03:00
83603fc939
DD-128 : Fixed! Recycled allow_open into allow_wear and use an extra virtual methods on bridge items to know if items are wearable or not.
2014-07-24 17:42:44 -07:00
30c73d0f25
MAINT-4218 FIXED Adding clothing from inventory closes THAT clothing folder and hides THAT folder
2014-07-14 12:28:29 +03:00
68b62747ed
Pull merge from lindenlab/viewer-release
2014-05-30 14:19:53 -07:00
23acc30e27
DD-102 : Fix crash when emptying trash containing nested folders. Also avoid getting listings several times
2014-05-16 17:12:22 -07:00
5956e75e17
MAINT-4064 FIXED Don't show Folder arrow for folders without visible children.
2014-05-21 12:11:34 +03:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
1e32b9dd33
Pull merge of lindenlab/viewer-release
2013-10-04 09:47:26 -07:00
12f0f8cb72
changed over to manual naming of MemTrackable stats
...
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
053d97db1b
better memory usage for LLTrace (tighter packing of recording arrays)
...
removed complicated and unnecessary fast timer gapless handoff logic (it should be gapless anyway)
improved MemTrackable API, better separation of shadow and footprint
added memory usage stats to floater_stats.xml
2013-09-25 19:12:35 -07:00
ab8f64a967
converted memory tracking units to KB from B
...
added more memory tracking to LLFolderView and kin
2013-09-24 00:05:43 -07:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
27d637d0f1
Merge downstream code from CHUIStorm release
2013-08-26 14:43:23 -07:00
64c5afa196
Merge latest viewer-release with FBC
2013-10-23 14:14:36 -07:00
63cc379c72
MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Control named RenderAutoMuteFunctionsnot found
2013-10-04 02:50:50 +03: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
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
359c3d520e
ACME-342 Format the PersonView so that it shows the avatar icon, SL name, FB icon, and FB name: Rendering now matches the UX spec.
2013-05-09 16:02:03 -07:00
00275301fc
ACME-275 : Fixed! Filtering on FB list works (tested with simulated data only so far)
2013-05-06 18:31:27 -07:00
ad12517329
ACME-275 : WIP : Filtering
2013-05-03 17:03:37 -07:00
03ad10d258
CHUI-849 : WIP : Filter limit on time instead of number of items
2013-04-18 19:46:08 -07:00
e84c97e86d
CHUI-912, CHUI-849 : Propagate arrange request correctly, limit sort, improve filter perf, clear traces, add comments.
2013-04-16 19:24:47 -07:00
b05bf882db
CHUI-912 : WIP : Fix resize test when folder is empty, add more traces (to be deleted)
2013-04-11 19:02:16 -07:00
d533a33f42
CHUI-912 : WIP : Add traces to various aspects of the inventory filtering, sorting and arranging (to be deleted)
2013-04-08 18:59:21 -07:00
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
9530b9d2b7
CHUI-694 FIXED Handle ALT + Up/Down and ALT + Right/Left to switch conversations in the list. Handle ALT + Enter to expand participant list of selected conversation.
2013-03-01 14:24:47 +02:00
45e72bf3cb
Pull merge from richard/viewer-chui
2013-01-10 11:49:29 -08:00
be3cfd872b
CHUI-649 : WIP : Cleanup code to make it readable
2013-01-09 20:20:32 -08:00
60eaa8875d
CHUI-652 : Fixed : Maintain multi selection consistent when click and drag an already selected item (drag multi select was broken)
2013-01-09 19:10:41 -08:00
856969285e
CHUI-658 FIXED Don't highlight whole content of the folder after right clicking if it is flashing.
2013-01-10 14:56:33 +02:00
0e7e877379
CHUI-659 : WIP : Cleanup llfolderviewitem of filter code as it all moved into llfolderviewmodel.
2013-01-07 19:12:32 -08:00
d71c0ab32c
CHUI-659 : WIP : Clamp down on the number of rearrange we really need.
2013-01-07 18:30:59 -08:00
e32f110b9a
Pull merge from richard/viewer-chui
2012-12-19 11:04:24 -08:00
8adca4583e
CHUI-600 : WIP : Flash conversation item in different color than select and start flashing only when shown
2012-12-18 22:57:56 -08:00
d2102c9b9f
CHUI-601 : Fixed : Crash when dismissing a conversation while a participant is selected
...
DeletePointer() for the items was replaced by Function LLFolderViewItem::destroyView():
Function LLFolderViewItem::destroyView(), before removing the item, immediately removes it from the Selection List of the Root Folder. As a result, at the time of the call of sanitizeSelection(), will not need to try to handle the elements that have already been deleted.
2012-12-19 17:26:55 +02:00
567df7bf27
merge
2012-12-06 21:43:19 +02:00
5f6d55eb1b
CHUI-444 (Click target off when conversation list is minimized to icons)
2012-12-06 15:19:10 +02:00
a4a2cc62c3
CHUI-509 : Fixed : Add params to inventory widgets to control font colors (required for library items and links).
2012-12-05 16:08:17 -08:00
2ee6bcab37
CHUI-571: Now when the 'Chat Preference' is set to 'Open Conversations window' the conversation line item with flash. The only time it does not flash is when the the conversation line item is already focused. Also fixed various focusing bugs when navigating between conversations and participants.
2012-12-03 16:19:46 -08:00
1a3c5e574b
CHUI-528, CHUI-536, CHUI-538, CHUI-540: Fixed the changed item's highlighting that broke multiselection in inventory and in conversations.
2012-11-26 17:49:16 -08:00
01a43d0a04
CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single processor of different types of notifications): changed item's highlighting
2012-11-23 15:10:28 +02:00
edeeed9541
CHUI-531 FIXED Poor fps in CHUI viewer
2012-11-21 01:41:49 +02:00
e298c2ded8
CHUI-487, CHUI-488 FIXED (Enable flashing FUI button behavior and Implement Flashing Conversations panel line item behavior): implemented FUI button flashing; clean up code
2012-11-16 22:36:12 +02:00
50b69c3f97
CHUI-487, CHUI-488 W.I.P. #3 (Enable flashing FUI button behavior and Implement Flashing Conversations panel line item behavior): implemented conversation's item flashing
2012-11-16 12:38:40 +02:00
865cb1b967
Pull merge from viewer-chui
2012-11-08 13:34:57 -08:00
d1f45654d9
CHUI-473, CHUI-482 FIXED (Clicking on nearby chat toast to open Conversation floater does not show Nearby Chat conversation selected in list; Nearby chat conversation is not selected in list by default when it is the only conversation ): implement. new logic in LLIMFloaterContainer for the syncronous select the conv. list's item and corresponding convers. floater; removed floater selecting from conv. items; fixed bug with item select
2012-11-07 18:45:02 +02:00
7c7cc56b03
Pull merge from richard/viewer-chui
2012-11-03 20:44:00 -07:00
51cabb2089
CHUI-444 (Click target off when conversation list is minimized to icons)
2012-11-01 13:56:25 +02:00
f9b1b44071
CHUI-463 : Fixed. Allowed a model to be shared by several views.
2012-10-30 18:27:56 -07:00
a7a24dc2f9
Pull merge from richard/viewer-chui
2012-10-29 20:43:32 -07:00
a815585fd7
CHUI-439 (Conversation floater is automatically unminimized when a selected user is removed from nearby chat participant list after teleport)
...
CHUI-438 (Conversation remains transparent after teleport with a participant selected in nearby chat)
2012-10-26 19:33:31 +03:00
d49de3a66a
CHUI-441 : WIP : Fix crashes when spawning torn off floaters, added widgets creation in the torn off floater for participants.
2012-10-25 18:16:56 -07:00
5e6f224b5e
CHUI-368 FIXED Lock icon shown when clicking on items in inventory
2012-10-01 20:02:28 +03:00
609fef1301
Pull merge from richard/viewer-chui
2012-09-26 09:18:57 -07:00
a62a4b60e8
CHUI-347 FIXED drawing selected conversation item background.
...
Moved some duplicating pieces of code from LLFolderViewFolder::draw() and LLFolderViewItem::draw() to separate methods to reduce code duplication in LLConversationViewSession::draw().
Changed some static variables in LLFolderViewItem to static members for using them in derived LLConversationViewSession.
2012-09-26 17:43:47 +03:00
3502e783b7
CHUI-342 : Fixed : Use user name and display name correctly. Sort according to user names.
2012-09-25 22:02:44 -07:00
381c13d0e5
CHUI-283: Refactor of how the layout is determined for LLFolderViewItem. Changed constant members that defined the layout to non-const member varaibles, which are populated using a .xml file.
2012-09-20 16:12:28 -07:00
5cb0a62216
CHUI-353: Regress Bug caused by a CHUI 283 commit. Problem: The font was rendering differently due to the folderviewitem::draw() method calling llview::draw(). I added llview::draw() initially but it is not longer needed. Resolution: Removing the call to llview::draw().
2012-09-20 11:28:10 -07:00
86ac47474f
Regress Fix: After a CHUI 283 commit the inventory items suffix was overlapping text. Problem was that a variable storing the width of the text was not passed in as a reference, which always resulted in the suffix overlapping the prior text.
2012-09-18 15:04:23 -07:00
3c8407f32c
CHUI-283: Now the avatar icon loads in the user's avatar image.Also the avatar image is of proper size. The participant of the conversation is offset correctly as well.
2012-09-18 12:15:51 -07:00
c6863d18d7
CHUI-283: Now upon the information icon and speaker icon do not overlap the username text. Instead the username text will be truncated with an ellipse to prevent the overlap. Also did a code cleanup.
2012-09-13 19:10:28 -07:00
2084d33c1e
CHUI-283: Now the information icon only appears upon mousehover. Also the information/speaker icon are right justified.
2012-09-13 11:22:41 -07:00
5dc8738076
CHUI-283: Basic Implementation, just have hard coded avatar icon appearing and profile/info buttons visible. profile/info buttons do not have proper positioning or mouseclick events.
2012-09-10 07:40:13 -07:00
6d84272d38
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-08-23 15:11:10 -07:00
41cba389f8
CHUI-269: Problem: When an item was purchased and delivered into the 'Received Items' panel, the badge icon and new item count would not show. This was due to the creation date of the folders not being set when a new item was added. Resolution: Now when an item is added into the 'Received Items' panel, the folder hierachy is updated, triggering the badge icon and new item count to show.
2012-08-16 12:14:25 -07:00
52814c4e99
CHUI-273: Problem was that after renaming the item, the item was not triggering a sort. Resolution: Once the name of the item is set, trigger a sorting of the parent.
2012-08-10 17:09:14 -07:00
88e81f9929
CHUI-223 WIP Selecting to cut an inventory item causes all open inventory windows to refresh
...
avoid moving selection when cutting
2012-08-01 20:07:42 -07: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
898ec6cd36
CHUI-254 FIX Fix Inventory filter and item draw() to highlight matching substrings in inventory
...
made background highlighting sit behind label, so as not to obscure neighboring characters in label
2012-08-01 14:44:29 -07:00
Andrey Kleshchev