Commit Graph

35 Commits (180daf3ab83ff9a83200c1952c0f09d20cfcb992)

Author SHA1 Message Date
Loren Shih 99590047eb automated merge avp->avp
--HG--
branch : avatar-pipeline
2009-12-11 16:01:44 -05:00
Loren Shih d2b72fe018 EXT-3373 : Favorites folder disappears after canceling filter
Doing a more robust check to see if folders need to be refreshed.

--HG--
branch : avatar-pipeline
2009-12-11 15:57:41 -05:00
Eric M. Tulla (BigPapi) 9db47b1d4b Fix for EXT-3368 - "Save Texture" functionality was no longer respecting perms 2009-12-10 16:07:54 -05:00
richard 207efe5089 ext-2049 - tighten up inventory indentations 2009-12-08 11:28:33 -08:00
James Cook 81c18d5442 EXT-3159 Mouse-wheel scrolling down causes unexpected side-scrolling
If vertical scroll bar is visible, give it the scroll events and
don't scroll horizontally.  Eliminated extraneous folder view item
scroll handler.  Reviewed with Richard.
2009-12-07 15:15:52 -08:00
Loren Shih a22bb00530 merge
--HG--
branch : avatar-pipeline
2009-11-24 12:10:10 -05: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
Loren Shih ad86caf479 EXT-2668 : Screwy logic for figuring out if a folder is removable
EXT-2661 : "Remove From Outfit" on COF doesn't take off my outfit
EXT-2662 : Can't delete a worn item link

Cleaned up the whole "isItemRemovable" logic, and having folders figure this out recursively via children.
Changed the isItemRemovable logic so that links aren't treated as worn for the purposes of deletion.

--HG--
branch : avatar-pipeline
2009-11-19 17:56:30 -05:00
Loren Shih 061b8d3aa6 EXT-1916 : Places: Landmarks are not sorted in the Favorites Bar Accordion 2009-11-18 17:58:09 -05:00
Loren Shih 2d82332479 Fix for avp->hg incorrect merge. 2009-11-17 21:23:53 -05:00
Loren Shih 08cbeea3c7 EXT-2583 : Some sidepanel inventory folders appear blank
Starting sidepanel inventory folders as open by default.
Also did some minor syntactic cleanup on the folder filter iterators.

--HG--
branch : avatar-pipeline
2009-11-17 15:03:14 -05:00
Loren Shih faef48504c EXT-2526 : Disable "double click to wear" on outfit folders
EXT-1763 : Places - Landmarks : Unable to drop a landmark into Landamrks & FavoriteBar accordian panels

Threefixes in here.
(1) Simple disable of double-click.
(2) Corrected typos "hierary"-> "hierarchy".
(3) Now adding start folder to specialized inventory panels, so that we get the start folder's listener for drag&drop operations.

--HG--
branch : avatar-pipeline
2009-11-16 17:52:15 -05:00
Eric M. Tulla (BigPapi) 3194c89177 Merging viewer2 changes into avp branch
--HG--
branch : avatar-pipeline
2009-11-13 19:26:20 -05:00
Loren Shih acdce23299 Header file cleanup
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.

--HG--
branch : avatar-pipeline
2009-11-13 17:47:00 -05:00
richard e3690313a2 EXT-2049 - tighten up indentations on inventory 2009-11-11 16:47:23 -08:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Steve Bennetts 642d368ecc merge 2009-10-21 18:49:19 -07:00
Richard Nelson 7813c18f34 selected inventory item no longer renders double box
reviewed by James
2009-10-21 21:50:26 +00:00
Steve Bennetts 65bf35cfed merge 2009-10-19 10:49:48 -07: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
Mark Palange (Mani) b4275c5d48 merge 2009-10-16 18:13:53 -07:00
Steve Bennetts 590d3b9e3a EXT-1279 Crash if font file not found.
Added getFontDefault() to llfontgl.h

--HG--
branch : branch-test
2009-10-15 14:14:46 -07:00
Adam Moss 4be3066ca0 fix an inventory window rendering quality issue introduced in the avatar-pipeline/currently-worn-folder-10 - it was drawing each inventory window row twice superimposed. 2009-10-13 18:16:04 +00:00
Bradley Payne 3bd6c1919c Merging avatar-pipeline/currently-worn-folder-10 down to viewer-2.
svn merge -r 134766:135946  svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 .
2009-10-12 18:40:11 +00:00
Leyla Farazha 18f1895bf2 EXT-1400 New 'name popup' lets you do things (IM, TP etc) to your own avatar
EXT-1021 Update code to use new Inventory Icon art files in floater_invetory.xml
EXT-176 Open and closed state for art for folders in list view in side panel
2009-10-10 00:43:39 +00:00
Adam Moss 8b8dfa2e2b EXT-1224 Inventory list uses ugly fake-italics
Reviewed by Richard.
2009-10-04 11:04:19 +00:00
James Cook 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
Bradley Payne 73d152093d For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3.
svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
2009-09-10 18:42:19 +00:00
Steven Bennetts 0aa2bc4831 svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2
Bug Fixes:
* EXT-637 EXT-595
Dev work:
* EXT-694
QA:
* Be sure feature works on other locales
Known issues:
* If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts.
* It is possible to create 2 deep level subfolders under the Calling Cards/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy.
* If friendship is removed when agent is offline, Friend Card is not removed from Inventory.
2009-08-28 22:58:17 +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 ac1b723fd7 svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
This merges in all appearance side panel bug fixes.
2009-08-18 15:34:09 +00:00
Loren Shih 7bbc5cdea6 svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-34223 : AVP Current Outfit Folder
For DEV-37485 : AVP Appearance Side Panel
For DEV-35335 : AVP Automatic Folder Classification

This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team.
2009-08-12 19:03:20 +00:00
James Cook 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
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
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