a4b223248e
Merge
2010-09-27 17:54:52 -07:00
ae623c8068
Set display name field now clamps to 31 unicode characters
...
Added ability to set max length in line editors by characters in addition to bytes
left other widgets (comboboxes/spinners) using the bytes, but it can easily be changed over
reviewed by Richard
2010-09-16 09:38:05 -07: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
0edb695ea8
instead of exposing mutable container in LLInitParam::Multiple, just expose access functions, begin(), end(), etc.
...
this allows mutation of param block contents, without being able to change number of elements
2010-09-22 14:48:18 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
7b4046df83
EXT-3531 - Ctrl-P does not work reliably on login
2010-04-01 11:47:21 -07:00
ecc2c72650
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
2010-03-29 16:55:22 -07:00
729f880f78
[SHOWSTOPPER] Fix for (EXT-4704) Add maturity icons to Prefs -> General and (EXT-4705) Show maturity icon on Region/Estate tab.
...
- Made changes to combobox onItemSelected() to fix (EXT-6269) typing a location into the nav bar always sends you to the first location you typed in.
- Replaced LLIconsComboBox pointers with base class pointers LLComboBox.
Reviewed by Richard Nelson https://codereview.productengine.com/secondlife/r/29/
--HG--
branch : product-engine
2010-03-18 00:53:32 +02:00
60799effae
Merge
2010-03-10 15:46:45 -08:00
18ebacefcf
Merge with viewer 2 beta 4
2010-03-08 10:54:23 -08:00
0775e91901
PE merge.
2010-03-07 15:27:17 +00:00
f499260782
Implemented (EXT-4715) Add maturity icons to Classifieds - create and details.
...
--HG--
branch : product-engine
2010-03-06 01:17:34 +02:00
b51515100c
rolled back changeset 5fbab7aa32ef to fix EXT-6269
2010-03-09 12:16:44 -08:00
931ff555bd
merge
2010-03-05 14:46:00 -08:00
a8e1c2ed13
Implemented (EXT-4705) Show maturity icon on Region/Estate tab.
...
- Added LLIconsComboBox class - a combobox with icons for maturity ratings.
- Fixed scroll list maximum width calculation. The width was calculated based on text value width for non-text columns.
- Added image overlay alignment getter method to LLButton.
--HG--
branch : product-engine
2010-03-05 15:41:25 +02:00
485711e179
removed extraneous updateBoundingRect() calls
...
remove the login progress panel as a popup only after it has finished fading out
popupview manages it's own registering and unregistering of popup callbacks
2010-03-04 16:35:52 -08:00
69f9c0bcf9
WIP - replace top ctrl with LLPopupView
2010-03-03 19:37:41 -08:00
41a30a59fb
initial work changing topctrl to popup layer
2010-03-02 14:21:58 -08:00
55bfb4435e
Look up display names via a web service
...
Also removed unused LLComboBox globals to reduce llappviewer.cpp
include file burden.
Review pending
2010-02-17 16:55:58 -08:00
12c61ac4d5
Fixed normal bug EXT-4616 - Combobox labels no longer appear.
...
--HG--
branch : product-engine
2010-01-28 19:32:18 +02:00
125b779fb6
merge
2009-11-17 23:39:42 -08:00
dd4a4409cd
Eliminated redundant selection callback for LLComboBox (mSelectionCallback).
2009-11-16 17:46:43 -08:00
7cc233b3a8
EXT-772 Dropbox widget needs "pressed" state - currently shows wrong art
...
Reviewed with Richard.
2009-11-16 12:52:25 -08: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
6c70154cd1
converted focus change callbacks to use signals
...
replaced mFocusChangedSignal that PE added with our hierarchical focus mgmt
reviewed by Leyla
2009-09-30 01:00:51 +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
58bce2d205
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-09-09 01:26:44 +00:00
138bf11322
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
...
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
a7adfe132e
DEV-38131 "Drop down boxes with text entry ignore the text in the entry field"
...
reviewed by James
2009-08-18 18:46:43 +00:00
caa367e5d4
svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3
...
EXT-172 - adding non-unicode support for group name line_editor
EXT-310 text was squished, moved things around so there was was more space between text blocks.
EXT-313 "me" panel
EXT-314 changed out arrow character for arrow art, added arrow art to textures.xml
EXT-315 replaced word "mute" with "block"
EXT-322 moved Use Chat Bubbles text box from _chat.xml to _advanced.xml
EXT-323 killed some two items
EXT-324 and EXT-322 removed small avatar names checkbox and added show chat bubbled checkbox
EXT-330 Sidetray filter - text overlaps search icon inside textbox
EXT-261 I18N: Labels in /character/avatar_lad.xml are not localizable
EXT-392 Rearranged floater_inventory_items_properties.xml to match spec
DEV-35897 Filters in sidebar remain active even after user has changed/closed tab
DEV-36886 I18N: hardcoded currency format in panel_status_bar.xml/status/buycurrency
DEV-36987 - Pressed states needed for widgets
DEV-36795 Remove slurl tooltip from navigation bar location box
DEV-37184 Move "Block List" out of topmenu and make a button in Prefs > Privacy
2009-08-11 06:37:35 +00:00
eb853f55c0
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-08-04 01:12:59 +00:00
e6240500a9
Minor change to protect against odd case where mArrowImage was NULL (unclear why it's happening, but the extra checks are not a bad thing).
2009-07-31 02:23:32 +00:00
8f7ec64899
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
...
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-27 17:56:26 +00:00
923d84d08f
EXT-127: Tooltips don't disappear immediately after moving mouse out of object
...
reviewed by Austin
2009-07-10 20:43:08 +00:00
52aeaa3284
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
...
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +00:00
d6101558a1
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
...
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +00:00
ade6bbb06c
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
2009-06-21 17:16:27 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
1aa0416aef
svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
...
Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-13 21:28:40 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
667ca55bad
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2009-01-05 18:59:12 +00:00
d725e5b240
QAR-872 Viewer 1.21 RC 3
...
merge viewer_1-21 96116-97380 -> release
2008-09-29 19:14:50 +00:00
80be4c1d2d
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
...
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
36fccc3888
svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 maint-ui-11-qa).
2008-04-30 23:30:09 +00:00
a3f3ab7e11
QAR-449 Viewer 1.20 RC 1
...
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
2008-04-17 02:56:14 +00:00
d85247e63e
QAR-449 Viewer 1.20 RC 0
...
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
2008-04-17 02:42:27 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
Leyla Farazha