1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
6987dcfd62
SL-11011 Multiselect, scroll to selection and search fix for estate's ban list
2022-02-02 20:44:08 +02:00
8d329f12d6
SL-16669 FIXED Wrong context menu is opened for objects owned by the group
2022-01-27 19:04:21 +02:00
e129986a49
SL-3007 Ability to report abuse from chat
2022-01-24 23:37:21 +02:00
9df87dd365
SL-13179 FIXED Sorting residents banned on the parcel by duration is incorrect
2021-05-27 23:51:59 +03:00
80dd72ff2b
Merge branch 'master' into DRTVWR-514-keymappings
2020-10-14 22:00:09 +03:00
af7cefe031
SL-6109 Cell selection support
2020-06-23 14:49:39 +03:00
4df05c5a89
SL-6109 Keyaboard support ready
2020-06-23 14:48:02 +03:00
9ec2aac56c
Merge branch 'master' into DRTVWR-482
2020-03-18 21:05:33 +02:00
258cc9c61a
Merge branch 'master' into DRTVWR-482
2020-02-05 18:31:06 +02:00
38649767a0
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into DRTVWR-481
...
Merge
2020-01-28 21:47:35 +00:00
c5859778bc
SL-379 WIP Joint overrides tab
2020-01-17 21:08:38 +02:00
9621dd8bbd
SL-12100 Premium Enhancements - Changes to rates to create Groups, UI Work
2019-11-22 20:18:30 +02:00
98b28e5881
SL-11910 [Win] Horizontal scroll
2019-09-10 19:49:15 +03:00
36594400a2
MAINT-8985 FIXED User is able to send friendship request to a friend from the group menu
2018-08-22 18:02:31 +03:00
81f4da6468
MAINT-7447 FIXED Selecting a group ability refreshes the list and deselects your choice
2017-06-06 12:47:51 +03:00
a6b3bb1a2d
MAINT-7146 No callback for 'Url.RemoveFriend' in LLScrollListCtrl
2017-02-20 14:20:43 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
731fe3e7c6
merge changes for 3.6.3-release
2013-08-19 15:14:23 -04: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
705d85fb2f
CHUI-942 FIXED Choose Resident picker problems
2013-05-30 17:04:19 +03:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
066f2acadf
Forgot to commit @#! merge
2013-04-11 16:23:36 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
385de35b93
CHUI-885 (View Profile,Send IM and Add friend are not functional in context menu for allowed or banned users of the parcel.)
2013-03-25 16:07:19 +02:00
3c08dccd5c
MAINT-2223 FIX Scroll list columns resize feature broken
...
column dirty flag was not set when user resized a column
2013-01-14 16:56:52 -08:00
c5f6ff43da
MAINT-1897 Poor performance viewing large group member lists
...
* Improve draw performance of scroll lists by only drawing what is visible
* Reduce frequency of expensive column width calculations
Fixes by Richard
2012-11-12 15:38:58 -08:00
83f5d0c616
Merge in viewer-development
2012-07-31 15:42:02 -07:00
0ee53b21d2
MAINT-30 Estate access lists for groups and residents are blank when "Allow public access" is checked.
...
MAINT-1200 Resident names not sorted in About Land (or Estate management) floater's allowed/banned boxes
reviewed with Simon
2012-06-25 13:41:53 -07:00
10614ebd91
Hijaking the land status messaging for temporary development of the pathfinding linksets floater.
2012-01-04 15:52:20 -08:00
943789b53a
SH-2710 FIX -- Removed calls to getChild happening every frame and during idle calls.
...
Reviewed by davep.
2011-11-23 12:11:53 -08:00
c4ec141cc0
fixed build
2010-10-15 14:33:10 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
326ad1933b
EXT-8207 FIXED (Unexpected camera zoom occures if scroll location history drop-down list by mouse wheel)
...
Added parameter for scroll list control that determines opaque of mouse scroll wheel event. Set this parameter to \"true\" in combobox of navigation panel.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/829/
--HG--
branch : product-engine
2010-08-06 18:50:24 +03:00
114e5ca083
EXT-5940 : Typedef all vector<LLUUID>'s
...
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
0f04222acc
fix for normal EXT-1391 Group Info: Avatar name should end with ellipsis if it doesn't fit free space
...
--HG--
branch : product-engine
2010-03-03 11:43:48 +02:00
a7bca7055a
PE merge. Conflict resolved.
2010-02-24 08:57:27 +00:00
1bd720eefb
cleanup and fix build
...
--HG--
branch : product-engine
2010-02-23 18:45:51 +02:00
a8165dfe59
fix for normal EXT-5598 Group member status list is sorted by name instead of date
...
--HG--
branch : product-engine
2010-02-23 18:05:00 +02:00
902c415595
gah, more dos line-endings in PE diffs.
2010-02-23 18:49:06 +00:00
dfad0f4e67
Fixed critical bug EXT-4663 ([BSI] Inviting Residents to groups produces error 100% of time).
...
Overriden LLScrollListItem::getUUID() in LLNameListCtrl so that you can get correct ID of a name list item.
--HG--
branch : product-engine
2010-01-26 20:17:45 +02:00
da00631c63
Update for low bug EXT-4371 - Text from search history drop-down list merge with landmarks on 'Favorites Bar'.
...
Made border customisable in combo box.
--HG--
branch : product-engine
2010-01-20 18:21:54 +02:00
ada0f4fa22
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
...
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
606b381c9f
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3
...
JIRAS:
EXT-96 EXT-204 EXT-312 EXT-334 EXT-479 EXT-498 EXT-514 EXT-637 EXT-647 EXT-746 EXT-748 EXT-749 EXT-757 EXT-789 EXT-794 EXT-808 EXT-817 EXT-823 EXT-831 EXT-834 EXT-837 EXT-844 EXT-848 EXT-862 EXT-876 EXT-896 EXT-897 EXT-898 EXT-899 EXT-910 EXT-912 EXT-918 EXT-921 EXT-925 EXT-926 EXT-928 EXT-930 EXT-931 EXT-935 EXT-938 EXT-939 EXT-952 EXT-985 EXT-986 EXT-992 EXT-994 EXT-995 EXT-996 EXT-997 EXT-998 EXT-1001 EXT-1004 EXT-1010 EXT-1012 EXT-1016 EXT-1018 EXT-1020 EXT-1028 EXT-1041 EXT-1044 EXT-1051 EXT-1052 EXT-1061 EXT-1069 EXT-1071 EXT-1074 EXT-1075 EXT-1076 EXT-1078 EXT-1080 EXT-1081 EXT-1082 EXT-1083 EXT-1085 EXT-1092 EXT-1093 EXT-1099 EXT-1100 EXT-1101 EXT-1104 EXT-1106 EXT-1111 EXT-1113 EXT-1114 EXT-1115 EXT-1116 EXT-1118 EXT-1119 EXT-1129 EXT-1132 EXT-1135 EXT-1138 EXT-1142 EXT-1161 EXT-1162 EXT-1178 EXT-1180
* NEW DEVELOPMENT:
* EXT-898 - Add dock/undock support for camera and movement controls
* Avatar list changes
* Bottom bar changes: menu, docking, visibility
* Camera changes
* Camera & Movement Floaters
* Dockable Floaters (LLDockableFloater)
* Removed LLListCtrl
* Toast / Notification changes: signal / destruction changes, ordering
* Nearby chat input should display active voice indicator
QA NOTES:
* Message Well Window is ready to be tested for regression & matching the spec.
* Verify Group List Item L&F
* Verify All tabs in People Panel
* Verify that Picks behavior is not changed
2009-09-29 19:37:05 +00:00
4601aef70a
merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
...
Fixes: EXT-839 EXT-859 EXT-868 EXT-795 EXT-861 EXT-678 EXT-848 EXT-873
2009-09-09 04:27:06 +00:00
Andrey Lihatskiy