6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
12db7a9739
FIRE-5283: Add option to sort friendlist in people panel by username
2014-02-10 11:18:30 +01:00
ae69248c32
FIRE-12750: Name filter on avatar lists not working correctly
2014-01-21 17:28:40 +01:00
62ad939f42
FIRE-3119: Introducing Contact Set Aliases (formerly Pseudonyms)
2013-12-11 00:24:22 -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
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
56b158e486
CHUI-675 FIX You can select multiple users in people floater but can only drag and drop one name to conversation
...
Moved drag and drop start in LLAvatarListItem instead of LLAvatarList, and made LLFloaterIMSession handle multiple dropped participants correctly
2013-02-01 18:54:15 +00:00
87b93b7625
Make it a float literal
2013-11-17 11:40:47 -07:00
7dd91de7c4
Resolve and remove a bunch of CHUI merge comments
2013-08-23 13:45:24 -06:00
8146bbda39
Merge
2013-07-09 16:26:07 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
64b001cda3
Fix some more CHUI merge issues including old merge bug in llavatarlist.cpp
2013-07-08 14:19:57 +02:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
a9ffc0120a
Merged with default tip (Revision 13149a524874)
...
--HG--
branch : RLVa
2013-05-06 23:54:58 +02: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
81d8473da0
FIRE-1089: Fix for friends list in people panel not respecting "Show Usernames" setting
2012-10-19 20:03:48 +02:00
8ab7f87d53
Merged with RLVa-1.4.6 tip
2012-06-27 16:40:29 +02:00
1714747536
After merge compare FS tree agsindt V/dev.
...
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
7b0455ba0f
Merged with default tip (Revision 78d1d228709c)
...
--HG--
branch : RLVa
2011-03-19 16:14:42 +01:00
90c9b9e9c5
STORM-680 FIXED (Avaline callers are added to the Recent list)
...
- When accepting an avaline call, add a caller to the recent list as AvalineListItem
- When adding item to the LLRecentPeople, check whether item with the same phone number exists and delete it if exists. This is need to avoid duplication in the Recent list of the panel People.
2011-02-11 13:49:10 +02:00
7ddd377a00
- review : @shownames=n related code in LLAvatarList and LLAvatarListItem classes
...
--HG--
branch : RLVa
2010-11-01 04:06:56 +01:00
1c2ef4090a
Merged with default tip (Revision f20bf424bd86)
...
--HG--
branch : RLVa
2010-10-30 17:28:00 +02:00
3bc37751b9
Added vintage speakers panel without volum sliders per person, removed overall non-functional volume slider from default speakers panel, made avatar list icons and volume sliders skinnable.
2011-12-14 20:14:57 +01:00
ade846530f
FIRE-475, Add direct volume sliders into speakers panel
2011-09-04 02:21:43 -04:00
8de8a5f1cf
Merge with RLVa 2.8, part 1
...
Known issues:
- RLV Debug method commented out
- RLV Windlight options not implemented
2011-08-27 01:21:37 -04:00
300d17822e
Show info buttons on speaker list, but not friends list
2011-08-11 23:00:52 -04:00
f8e61c64c1
- added : share inventory by drag-and-drop'ing items onto an avatar list item
2011-06-20 00:22:23 +02:00
a75110587d
- internal : fix various RLVa merging issues
2011-05-26 21:47:58 +02:00
861d4e22b2
Fix avatar distance in minimap when avatars are over 1024 meters high. From Ansariel Hiller, fixes FIRE-841.
2011-04-12 12:45:53 -05:00
10e88f3891
Merge with RLVa-LL2.5.2
2011-04-09 22:24:22 -07:00
30c1861891
More debug message cleanup
2011-03-29 23:20:07 -04:00
9c24c207d7
Radar Improvements: Radar always active, Minor Refactoring, Ansariel's colorful range indicator
2011-03-29 22:40:09 -04:00
2781068c3f
Bugfixe for radar. Friends list icons work again, other code cleanup.
2011-03-06 15:28:01 -05:00
edb4b838fe
Radar part 2 - more examples, line spacing, headers, teleportTo
...
Examples still to implement: sorting, chatrange, full sim scanning
2011-03-06 12:06:54 -05:00
e27f180124
Experimental Radar Functionality, part 1 (unfinished)
...
- Layout
- TimeDetected,Distance,AvatarAge,PaymentStatus
- unfinished nearbychat triggers
- unfinished layout controls / sorting
- unfinished right click context menu
2011-03-03 22:58:47 -05:00
23ba0e9827
Always show usernames on avatar lists
2011-01-24 00:01:46 -08:00
0586dca369
Merge up part2 to Release 2.4.0 + RLVa . Needs live testing
2011-01-19 12:40:31 -05:00
496409e5b6
FIRE-187. "Show Permissions Icons" friends menu control fixed.
2010-12-19 13:47:52 -05:00
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
60db8577a9
Merge
2010-09-16 12:02:24 -07:00
f7ff27e313
Merged with default tip (Revision b8cd74d2bcc8)
...
--HG--
branch : RLVa
2010-09-15 23:22:10 +02:00
a923da7fc7
DEV-52931 Toggling "View Display Names" doesn't take effect right away in the Friends list
2010-09-13 14:59:31 -07:00
bd734e3198
VWR-21253 MERGE Permission icons in the friends list
2010-09-07 17:55:10 +01:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
1911993cc7
merge
2010-09-16 19:45:57 -07:00
e6e551cb41
Merged with default tip (Revision 7a739cbdce56)
...
--HG--
branch : RLVa
2010-08-28 02:06:00 +02:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
73ff8eb78b
- review : tidied up a few RLVa code tags
...
--HG--
branch : RLVa
2010-08-25 16:30:04 +02:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Tank_Master