6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
153d45a57a
Add setLineHeight method to LLScrollListCtrl - this might be handy in the future
2014-04-22 18:00:43 +02: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
b428e50b99
Include remove friend agent slurl context menu option also in scroll list control
2013-08-28 23:02:01 +02:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07: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
b9bb1602f8
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
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07: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
3e37f51aa3
Fix for radar not filtering correctly anymore after LL 3.4.3 merge
2013-02-14 01:29:32 +01:00
cc44316aed
Merge LL 3.4.3,
...
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
2012-12-18 00:36:35 -08:00
9f4245779c
Partial Merge of LL 3.4.2 Release
2012-12-10 15:56:46 -08:00
4d086c7faa
Firestorm Area Search re-write. See full comment comments for details.
...
Engine redone and is now 10x to 100x faster and many bugs fixed.
UI changed and added tabs.
Added search for creator, last owner.
Added regular expressions to the find tab.
Added filter result list for:
For sale, distance, mouse click action, touch, locked, physical, phantom, tempary, and attachment.
Can include or exclude attachments, physical, or temporary objects in the search.
Added distance, creator, last owner columes.
Options to display any columes.
Right click menu on result list to perform action on selected objects:
Script info, touch, teleport to, inspect, edit, return, delete, and buy object.
Display beacons on found objects.
2012-10-29 21:39:06 -04: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
dee3aa1232
Minor refactoring of LLScrollListCtrl
2012-08-18 15:10:54 +02:00
01c7d1eafb
Merge LL pathfinding
...
with help from Armin and NickyD
2012-08-06 18:14:39 -07:00
8b2939934f
Small optimization to radar name search
2012-06-03 18:48:49 +02:00
2765106aba
Fixed not working search on radar (FIRE-2179)
2012-06-03 18:09:26 +02:00
31c48c6d84
Brought back script progress floater when resetting/recompiling/etc. scripts (FIRE-1783)
2012-05-26 00:04:40 +02:00
10614ebd91
Hijaking the land status messaging for temporary development of the pathfinding linksets floater.
2012-01-04 15:52:20 -08: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
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
96251ab311
Added davep's fixes in SH-2710 - Performance improvement by caching UI control lookups.
2011-12-03 21:09:41 +01:00
bc57b21b21
STORM-20: legacy friends list permissions
...
Moved to useing llavatarnamecache
Lots of clean up
Added support for sorting by usename via column sorting redirection
Removed code for avatarlist
Colorfied list control line stripe for FS skin
2011-07-04 15:20:31 -07: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
Tank_Master