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
f46a15b3f3
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-11 15:04:11 +01:00
b6c7eee505
SL-16320 Remove references to AvaLine from the viewer
2021-11-05 21:01:45 +02:00
b61a998574
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-17 19:29:33 +01:00
db161b6f85
SL-14074 Resolved potential cause of conversation crashes
...
Models (listeners) belong to folder-views, deleting all of them means that not only proper cleanup procedure won't be followed, and view might try clean dead pointer.
2021-01-05 18:20:47 +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
357ded33cf
removing test code
2013-08-29 12:06:46 -07:00
1c740dfb51
Pull merge from viewer-release
2013-05-22 14:21:49 -07:00
46c690bd50
Adding in fast timer for testing creation of 300 avatar list items vs folderview items.
2013-04-11 18:26:48 -07:00
479c5f4b4a
adding in logging of building a list of 300 users inside LLAvatarList and LLFolderView to determine drawbacks/benefits and timing.
2013-04-09 13:24:51 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
33922af1fa
Merge LL release
2013-11-01 19:52:14 -07:00
0a1a351b86
Merge Viewer-Share
2013-10-21 23:51:34 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
5749fdaf54
Properly ifdef out LLParticipantList
2013-06-29 20:10:44 +02:00
b49d94e934
Use pre-chui LLParticipantList (in fsparticipantlist.*)
2013-06-28 21:17:28 -06:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
3a49beed0e
CHUI-580 : WIP : Change the display name cache system, deprecating the old protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.
2012-12-05 20:25:46 -08:00
5238a39b54
CHUI-552 : Fixed : Filter out participant creation with the same id than the session id
2012-11-29 20:33:17 -08:00
486bdf3284
CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:
...
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-09 12:45:36 +02:00
87c94625d3
CHUI-468 : Fixed. Final clean up of LLParticipantList, including dependencies.
2012-11-07 16:49:03 -08:00
626d07daa1
CHUI-468 : WIP : Clean up LLAvatarList and all sorting code left over in LLParticipantList
2012-11-07 15:36:16 -08:00
8c64fbf1b7
CHUI-468 : WIP : More cleanup and fix of the participants sorting in LLIMConversation
2012-11-06 18:32:45 -08:00
2d9d44e316
CHUI-468 : WIP : Taking LLAvatarList and related out of LLParticipantList
2012-11-05 18:33:39 -08:00
fb3df4790e
CHUI-459: Creating a fetchAvatarName() method for the LLConversationItemParticipant class to allow the class to query for the avatar display name directly. Also, added a field to store the avatar name cache callback connection so that we can disconnect properly on object destruction to avoid a crash with the callback attempting to access recently freed memory.
2012-10-30 15:59:42 -07:00
1251f45e62
CHUI-394 FIXED Group moderation tools missing in right click menus
2012-10-17 00:16:18 +03:00
5b0e06108b
CHUI-340 : Fix dupe items in the conversation model list. Refresh when resorting.
2012-09-24 19:55:31 -07:00
b5583906d0
CHUI-340 : WIP : Fix sorting bugs on time for sessions, simplified the update time mechanism and clean up
2012-09-21 18:12:06 -07:00
fc6bbee3f4
CHUI-340 : WIP : Implement time update on all IM typing cases
2012-09-20 20:48:20 -07:00
1107803a5c
CHUI-340 : WIP : Implement time update and comparison for sessions and participants
2012-09-20 17:50:58 -07:00
f5fc2a9c3a
CHUI-340 : WIP : Update time stamp for IM and voice utterance
2012-09-19 17:59:37 -07:00
d22c8510b1
CHUI-340 : WIP : Sorting implemented. Type and name work. Date and distance still need the relevant values to be computed.
2012-09-17 17:53:17 -07:00
c26867bb6d
CHUI-285 : Implement sort, alphabetical only for the moment
2012-09-07 19:53:38 -07:00
ee5e689331
CHUI-285 : Completed. Update the names of the participants.
2012-09-06 16:32:17 -07:00
ab37263a5c
CHUI-285 : LLIMFloaterContainer is now using LLParticipantList fully
2012-08-30 21:34:48 -07:00
ad070b9155
CHUI-280 : Implement all LLConversationModel updates in LLParticipantList. Allow mAvatarList to be NULL.
2012-08-28 23:13:10 -07:00
c4638d1dca
CHUI-280 : WIP : Implement update of LLConversationModel in LLParticipantList
2012-08-28 19:09:57 -07:00
fd62242dd6
CHUI-280 : Make LLParticipantList derives from LLConversationItemSession
2012-08-24 17:31:12 -07:00
a3e8afc99d
Hide sort separator in participant list's context menu if no sort options are shown
2013-02-18 23:28:33 +01:00
0cfea7b406
CHUI-147 FIX Added updating conference participants in IM floater title
...
- The title is updated with the data from participants list widget in IM floater.
- Creating the participants list is fixed for the case of starting the ad hoc session when the session id changes upon initialization (see LLIMConversation::buildParticipantList()).
- LLEventTimer replaced with simple LLTimer to avoid crashes in LLEventTimer::tick().
- Moved the build_residents_string() code to LLAvatarActions::buildResidentsString() to use it in LLIMFloater::onParticipantsListChanged().
2012-06-26 01:38:59 +03:00
0568fb00ab
CHUI-102 WIP Implemented new context menu for ad-hoc and group conferences
2012-05-15 19:31:55 +03:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
c862949010
"Eject from Group" on the group participant context menu
2012-02-04 22:43:04 +01:00
13d510d5f2
EXP-1847 FIXED Fixed inability to mute a nearby avatar in Voice Settings if the speakers list is sorted by name.
...
Added missing update of the floater's internal speaker list.
2012-01-27 19:31:52 +02:00
886946d699
EXP-1839 FIXED Fixed treating normal nearby speakers as text-only chat participants which led to marking muted avatars as non-muted.
2012-01-26 19:37:53 +02:00
9429d5d2f2
EXP-1839 WIP Added some debugging messages.
2012-01-26 19:35:42 +02:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
6e2b3fd634
STORM-1712 Do not sort recent speakers list if mouse is hovered over it
2011-12-02 18:48:43 -05:00
Ansariel