fa3b57bd9f
Merge the work lost in 49c9461937df back into the tree
2009-11-04 15:14:54 -08:00
b806edf4ac
Redo Bao's broken merge
2009-11-04 14:59:23 -08:00
995c18b1c7
removed picture_style from LLButton::Params and allow empty labels
2009-11-02 19:28:24 -08:00
a6b6ca9a24
made floater close/minimize buttons "chrome" so they don't take keyboard focus
...
removed LLHudView::colorFromType which was unused
reviewed by James
2009-11-02 14:58:39 -08:00
1de55a5870
merge
2009-10-30 17:54:52 -04:00
59c6dc7ed6
Floaters can be resized again - fix for regression introduced yesterday by me.
...
Floater drag handle visibility/enablement was getting lost during construction.
Reviewed with Richard.
2009-10-30 17:54:22 -04:00
b2526cde23
merge from default branch
...
--HG--
branch : product-engine
2009-10-30 19:17:53 +02:00
ff97c31995
fix task EXT-1960 Region messages, should they be displayed in the local chat?
...
and working on
EXT-239 Save chat window state and position between sessions (not finished)
--HG--
branch : product-engine
2009-10-30 17:00:23 +02:00
432e243e1a
EXT-1352 Add image art to floater backgrounds.
...
Implemented "legacy_header_height" hack to account for new art being 25 pixels
tall instead of legacy 18 pixels -- it auto-sizes the floaters to be taller.
Made all floaters have resize handles, just disable and make invisible if unused.
This simplifies the floater construction logic. Floater header height now lives
in floater.xml, not as a global saved setting. Reviewed with Richard.
2009-10-29 15:37:25 -07:00
f80a3e268a
Revert change: Floater constructor CANNOT call LLPanel(p) with params, must set bg images in initFromParams, because we have too many LLPanels to retrofit them all to call LLPanel() with params. Discussed with Richard.
2009-10-27 16:26:49 -07:00
e018ecf469
EXT-1352 First pass background images for floaters and panels, including pretty header.
...
Reviewed with Leyla.
2009-10-27 15:01:09 -07:00
aa75245a1a
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-20 11:34:46 -04:00
9fc74de1a1
merge
2009-10-19 12:57:25 -07:00
a606e7be9b
DEV-41253: Code cleanup for current help context code.
...
Make the floater help buttons, "?", use exactly the same code path as
the side tray panels to evaluate the current help context, so that we
don't have two implementations that could diverge in the future.
2009-10-19 18:16:09 +00:00
65bf35cfed
merge
2009-10-19 10:49:48 -07:00
8103710c05
Merging revisions 2046-2068 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
...
* Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253 EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231
* Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476
* IM changes
2009-10-19 01:45:44 +00:00
4ea9361aa8
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-17 12:23:38 -04:00
2a5c25cb3a
New LLFloater methods capture LLFloaterReg visibility tests.
...
The logic was redundantly expressed in LLFloaterReg -- and would be
useful elsewhere -- so was introduced as LLFloater::isShown(). Thanks to
Richard and James for suggesting the terminology.
2009-10-17 11:56:26 -04:00
3e10fa4d51
merge from latest svn/viewer-2-0 to hg/viewer-2-0
2009-10-16 16:42:45 -07:00
925f01f6a0
DEV-41253: Updated the help context calculation code so that it will
...
now search through a panel's children to see if there are any visible
tabs that have a help topic string defined. If so, we use this string.
Updated all of the XUI files that include a tab_container to define
help topic strings for their child panels. I named all of these strings
with the floater name as the prefix and "tab" at the end. For example,
"preferences_display_tab" or "people_nearby_tab".
2009-10-15 13:08:12 +00:00
20e56a6925
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1992 https://svn.aws.productengine.com/secondlife/pe/stable-2@2004 -> viewer-2.0.0-3
...
* Bugs: EXT-1091 EXT-1418 EXT-996 EXT-1150 EXT-1188 EXT-1417 EXT-1181 EXT-1058 EXT-1397 EXT-836 EXT-1437 EXT-1379
* Dev: EXT-1291 EXT-1255 EXT-992 EXT-96 EXT-1157
2009-10-13 16:25:48 +00:00
4c89e73893
Fixed a problem where floaters that failed to load their XML would still be opened. This was particularly a problem with Modal Dialogs since the UI would loose focus with no floater to respond to.
...
Reviewed by Leyla
2009-10-08 22:39:17 +00:00
50247533f9
Merged latest viewer/login-api with latest viewer/viewer-20
2009-10-07 17:51:28 -07:00
ec84b639ed
EXT-1339 Create onClose method in LLFloater, and remove most bindings to mCloseSignal. In the vast majority of cases, mCloseSignal is being bound to an onClose function. Just make it virtual and be done with it. Renamed a couple of LLPanel close methods to onClosePanel() to distinguish them. Reviewed with Richard.
2009-10-07 20:54:31 +00: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
4d53e235c2
merge of latest viewer/viewer-20
2009-10-02 10:35:42 -07:00
eca30a2262
QAR-1619: merge up to 2009-09-26 viewer/viewer-20
2009-09-30 21:42:04 -04:00
feabeb4965
DEV-35039 Viewer 2.0 Help System - Viewer Development
...
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
2009-09-30 17:46:31 +00:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +00:00
bb1d4592bd
Merged latest viewer/viewer-20 into login-api.
2009-09-18 15:22:25 -04:00
689af4b329
DEV-38598: remove dangerous compare-LLSD-less-than operation
2009-09-12 09:11:32 -04:00
d40d745cba
DEV-38598, QAR-1619: Ensure we remove LLFloaterTOS from LLFloaterReg registry.
...
LLFloater's destructor calls LLFloaterReg::removeInstance() with its own name
and key. But for the new LLFloaterTOS invocation, we pass a key that's an LLSD
map. removeInstance() critically depends on LLFloater::KeyCompare::equate() --
but equate() never considered a non-scalar LLSD key value. Fortunately
llsdutil.h already provides a deep-equality function for LLSD: llsd_equals().
Making equate() trivially call llsd_equals() fixes the crash on TOS cancel.
2009-09-11 22:24:30 -04:00
44f294d484
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1602 https://svn.aws.productengine.com/secondlife/pe/stable-2@1608 -> viewer-2.0.0-3
...
* Bugs: EXT-848 EXT-865
* New Dev: EXT-790 EXT-822
2009-09-10 03:08:54 +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
745845f799
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
...
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +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
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
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
83a6ea234f
Merge skinning-15 to viewer-2. Fixes include:
...
DEV-35175 Spawning context menu should not move mouse cursor (Note: introduces regression where menu can fall off bottom of screen, will fix shortly)
DEV-35143 Modal alerts appear behind side tray
DEV-35141 Landmarks image and description outside of landmarks
Merging revisions 126418-126419,126726-126727,126856-126857,127010-127011,127014-127016 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-15 into G:\viewer-2.0.0-3, respecting ancestry
2009-07-14 19:06:17 +00:00
e4dc104e32
EXT-70 Camera and Movement controls don't save their positions
...
DEV-35250 Quitting from the login screen forgets window placement and visibility (e.g. movement and camera floaters)
reviewed by Leyla
2009-07-10 21:18:42 +00:00
75e1187f31
EXT-126 - Grayed empty field appears after minimize the 'Search Second Life' dlg
...
EXT-124 - Empty local chat window appears after the viewer was resized
reviewed by Austin
2009-07-09 01:07:03 +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
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +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
e188badaf2
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
...
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
2009-02-03 17:56:26 +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
Bryan O'Sullivan