Richard Linden
7127fa493c
EXT-7750 - Wearing list does not need to be bold or show link or worn
2010-06-10 17:07:45 -07:00
Loren Shih
1d6ebfbb57
EXT-4088 : FIXED : INFRASTRUCTURE : Change LLFolderView::getSelectionList to return a selection
...
Function signature change to return a selection instead of taking one as an argument.
2010-05-13 16:53:29 -04:00
Mike Antipov
35fc01e3f5
Fixed normal bug EXT-6757 (The whole My inventory area becomes selected if an object has been drug&dropped from Trash folder)
...
Reason: LLFoldefView has set ShowSelectionContext attribute when drag is started. And selected item is shown with filled selection after item is dropped until mouse is over inventory panel.
In case of drag from Trash that item removes from inventory and selected item is the whole My Inventory folder. So, it is shown with filled selection.
To fix this bug it is necessary to call setShowSelectionContext(FALSE);
Implemented in LLFolderView::onMouseLive() handler.
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/275/
--HG--
branch : product-engine
2010-05-05 12:40:05 +03:00
Mike Antipov
59d296e200
Fixed major bug EXT-6682 (Emptying Lost & Found Folder can crash Viewer2.0 if recent item was added)
...
Reason: a pointer to renamed item was not nullified in Folder View when rename control lost focus.
Fix: updated focus lost callback to nullify the pointer to renamed item. Had to made this callback non-static to have access to Folder View's member pointer.
Also made "New..." menu items disabled for Lost & Found folder.
Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/251/
--HG--
branch : product-engine
2010-04-19 14:12:42 +03:00
Yuri Chebotarev
bda0e60f98
fix for normal EXT-6354 [HARD CODED] - Inventory, Filter-popup: Title isnґt localized
...
reviwed https://codereview.productengine.com/secondlife/r/35/
--HG--
branch : product-engine
2010-03-16 15:31:30 +02:00
Mike Antipov
ca37311987
Fixed major bug EXT-3981 ([BSI] scroll bar resets to near the top of inventory search)
...
- disabled auto scrolling in inventory panels when mouse pointer is over the panel
--HG--
branch : product-engine
2010-03-02 16:26:30 +02:00
angela
e747e9a3da
EXT-4837 [NUX] When filter results in null state, provide a message suggesting the user try global search.
2010-02-11 22:27:49 +08:00
Ychebotarev ProductEngine
ab68d36518
working on normal EXT-4261 Cannot use Keyboard to navigate to search result in my landmarks tab
...
--HG--
branch : product-engine
2010-01-28 08:22:26 +02:00
Loren Shih
a2d4b740ed
EXT-4089 : InventorySP File->Open doesn't open folders.
...
Includes some minor const correctness infrastructure changes.
2010-01-08 12:34:10 -05:00
Loren Shih
fbf5d1a992
EXT-3304 : Can't reorder items in the Favorites accordions
...
EXT-3476 : Dragging and item in the PlacesSP brings up the InventorySP
EXT-1916 : Landmarks are not sorted in the Favorites Accordion
Added a new LLInventoryObserver::SORT request for resorting folder contents.
Landmarks no longer use the same sorting as accordions.
--HG--
branch : avatar-pipeline
2009-12-15 13:47:31 -05:00
Loren Shih
96d5f52624
EXT-3274 : Landmarks or Favorites accordion panel shows up as empty
...
EXT-1609 : Strange behavior for accordions in Places panel, Landmarks tab
Forcing top-level folders open when accordion is active. Removed logic that was saving and restoring initial folder state.
--HG--
branch : avatar-pipeline
2009-12-09 14:47:52 -05:00
Nyx (Neal Orman)
938c51d2a4
merge to pull viewer-2 changes into avp
...
--HG--
branch : avatar-pipeline
2009-12-04 17:03:34 -05:00
Loren Shih
9b89325cc9
EXT-3124 : Add lookup for finding all linked items to an item
...
Filter now works correctly.
Made some naming changes (e.g. setFilterType -> setFilterObjectType) so that what you choose to filter by is more explicit.
--HG--
branch : avatar-pipeline
2009-12-04 11:42:17 -05:00
Loren Shih
0f2f846a12
EXT-3125 : INFRASTRUCTURE : Cleanup LLInventoryFilter to disambiguate various filter options
...
EXT-3124 : Add lookup for finding all linked items to an item
LLInventoryFilter cleanup, including adding ability to lookup item by UUID.
--HG--
branch : avatar-pipeline
2009-12-03 20:50:21 -05:00
James Cook
26a38ab852
EXT-2954 Crash when using the mousewheel in any inventory panel
...
LLFolderView was explicitly passing scroll events back to its
parent LLScrollContainer, which it didn't need to do. It may not have
exhibited an infinite loop before due to bugs in the border width
computations for scroll rectangles. Reviewed with Leyla.
2009-12-03 17:37:10 -08:00
Loren Shih
2b54c8a084
EXT-2763 : Right-click on inventory doesn't bring up context menu
...
Also did some minor cleanup on header files.
--HG--
branch : avatar-pipeline
2009-11-23 17:46:30 -05:00
Bryan O'Sullivan
b806edf4ac
Redo Bao's broken merge
2009-11-04 14:59:23 -08:00
Steven Bennetts
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
Eric Tulla
850c0f1e33
Merge of latest avatar pipeline working branch into viewer2.0 branch.
...
Result of: (NO CONFLICTS)
svn merge -r 135985:136503 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-11 .
2009-10-16 20:11:51 +00:00
Richard Nelson
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
Richard Nelson
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
Loren Shih
363de6c3bc
svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-links__merge__viewer-2.0.0.3-r127634 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
For DEV-36425 : Viewer merge for Folder Links and Types [VIEWER]
Test plans - EXTERNAL
* [ Test against a 1.30 server ]
* Test various inventory operations -- move, copy, paste-as-link, etc. on both folders and inventory items.
* Test ability to change user-created folder types. Test inventory operations on these folder types.
Test plans - INTERNAL
* Test against any inventory smoke tests.
* See test plan in QAR-1643 for full FolderLinks&Types test plan.
2009-07-23 23:41:12 +00:00
Xiaohong Bao
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
James Cook
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
Loren Shih
a00af78b95
merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-06-24 21:36:42 +00:00
Nat Goodspeed
fcaa1ad46f
QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to
...
Boost.Signals2 like the rest of the event-system-n code.
2009-06-22 12:52:18 +00:00
Steven Bennetts
ade6bbb06c
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
2009-06-21 17:16:27 +00:00
Steven Bennetts
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
Adam Moss
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
Aaron Brashears
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
Steven Bennetts
d725e5b240
QAR-872 Viewer 1.21 RC 3
...
merge viewer_1-21 96116-97380 -> release
2008-09-29 19:14:50 +00:00
Steven Bennetts
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
Steven Bennetts
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Steven Bennetts
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
Bryan O'Sullivan
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
Steven Bennetts
b5936a4b1d
1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
...
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-03 19:21:14 +00:00
Steven Bennetts
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
Steven Bennetts
2e32d44e71
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
...
QAR-290 = QAR-271 + QAR-191
2008-02-19 21:42:32 +00:00
Josh Bell
df4d167cd1
svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
...
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
2007-12-21 06:44:41 +00:00
Jon Wolk
7dd08303a3
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
2007-12-19 00:56:59 +00:00
Christian Goetze
5ec8bbbe22
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
2007-10-10 00:01:43 +00:00
Aaron Brashears
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
Christian Goetze
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
Kelly Washington
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +00:00
Don Kjer
1c909afe39
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-02 21:24:47 +00:00
Josh Bell
ea8fb7238e
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31 01:41:19 +00:00
Steven Bennetts
5e9e67cb2d
merge -r 59028:59178 maintenance -> release.
2007-03-16 20:39:40 +00:00
Aaron Brashears
305c74d516
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-02-02 17:28:58 +00:00
James Cook
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00