Commit Graph

299 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Loren Shih f5ade203cb EXT-4930 : Remove ability to change folder type in release viewer2.0
You should not be able to change folder type in viewer2.0; this was meant as a debug option and I swear it was removed some time ago and crept back in...
2010-02-03 16:56:25 -05:00
Dmitry Zaporozhan c679ae3546 Fixed normal bug EXT-4768 - 'Play' btn does nothing to gesture in Inventory side panel.
--HG--
branch : product-engine
2010-02-01 17:11:31 +02:00
Loren Shih f0ee8af8ae EXT-4816 : Fix coverty whine on break statement fallthrough
Can't fix the whine, but added a comment that the fallthrough is deliberate.
2010-02-01 13:46:22 -05:00
Mike Antipov 8a7ca61479 Work on major bug EXT-3985 ([BSI] Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x)
-- cleanup: removed deprecated code added for previous sollution to support custom sorting of favorite landmarks.

For now previous implementation is removed, bug is FIXED.

--HG--
branch : product-engine
2010-01-29 13:05:11 +02:00
Tofu Linden efe8b578db merge. 2010-01-22 12:21:59 -08:00
Loren Shih 3b0ba0c2d7 automated merge viewer2.0->viewer2.0 2010-01-22 14:55:39 -05:00
Loren Shih 0283837e56 EXT-4492 : Deleting gestures from the wearing tab causes the viewer to crash
EXT-4660 : Can delete a bodypart from the COF through inventory view or WEARING tab delete key
EXT-4662 : remove leading separator from COF right-click menu
EXT-4633 : AppearanceSP trash button doesn't update enabled state correctly

Bunch of UI fixes related to the trash/delete functionality in InventoryFloater/SP and AppearanceSP "WEARING" tab.  The main idea is that we don't want to allow deletion of bodyparts and folder links from the COF by the user.
2010-01-22 14:44:32 -05:00
Tofu Linden 3889d43299 PE merge. 2010-01-22 10:51:58 -08:00
Loren Shih c64638dc21 EXT-4492 Deleting gestures from the wearing tab causes the viewer to crash
Revert removal of "delete" option from last checkin.
Now enabling "delete" but checking if *this was deleted within removeItem().
2010-01-22 10:48:24 -05:00
Mike Antipov 4230c65548 Fixed major bug EXT-4609 Deleting duplicate calling cards also removes a Resident from ur Friends list :(
- removed separate logic for Residents in the Friends list when Calling card is removed

--HG--
branch : product-engine
2010-01-22 13:17:58 +02:00
Rick Pasetto dc47f52e9f merge 2010-01-21 18:40:37 -08:00
Loren Shih af2f61af50 EXT-4492 Deleting gestures from the wearing tab causes the viewer to crash
Removed "delete" from the COF menu, since it is normally disabled from the inventory view.
2010-01-21 20:34:10 -05:00
angela 52baeb34b3 EXT-4269 PDD: Add teleport destination to teleport warning dialog 2010-01-19 11:06:17 +08:00
Mike Antipov 6e67ac5e02 Fixed low bug EXT-4311 (Order of items in 'Favorites Bar' folder remains non-changed if change its order in the 'Favorites Bar')
-- reason: there was two places where identical resorting of Favorite landmarks functionality was implemented: InventoryBridge & Favorite bar.
    It was not impelnmented properly in favorites bar: LLInventoryObserver::SORT flag was not set after d-n-d.
-- fix: moved identical functionality to update & save order of Favorite landmarks from these places to Inventory Panel

--HG--
branch : product-engine
2010-01-15 18:02:42 +02:00
Mike Antipov c3c0b5ed47 Fixed normal bug EXT-4312 (Landmark occupy random location in the 'Favorites Bar' accordion if drag-and-drop it)
-- added LLInventoryCallback to rearrange favorite landmarks properly after new on is added.

--HG--
branch : product-engine
2010-01-15 20:18:22 +02:00
Mike Antipov 06838dfd57 Work on normal bug EXT-4312 (Landmark occupy random location in the 'Favorites Bar' accordion if drag-and-drop it)
-- refactoring: move functionality to rearange Favorite landmarks from Inventory Folder bridge to Inventory model
-- improved logic to place dragged landmark before target one.

--HG--
branch : product-engine
2010-01-15 19:56:37 +02:00
Loren Shih 04f1a83b2e EXT-3955 : [ AppearanceSP ] "Add to Current Outfit" confusing for outfits, remove it
Removed "Add to Current Outfit" from right-click outfits context menu.
2010-01-14 19:44:07 -05:00
Loren Shih d9b8307786 automated merge viewer2.0->viewer2.0 2010-01-08 16:33:43 -05: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
richard 3a0b948bb3 merge 2010-01-07 18:38:28 -08:00
Brad Payne (Vir Linden) e55193cf85 For EXT-4030: Can delete the outfit folder that you're wearing in My Outfits 2010-01-07 14:55:49 -05:00
richard e28eac929b EXT-4014 - Inventory folders should use "open" folder art...
reviewed by Leyla
2010-01-06 16:17:27 -08:00
Brad Payne (Vir Linden) 5c8b2deb82 For EXT-3622: Take off item, wear a different item --> first item is put on again. Fixed the 'remove all clothing' case. 2009-12-23 15:15:49 -05:00
Brad Payne (Vir Linden) 55c1f18c8d For EXT-3622: Take off item, wear a different item --> first item is put on again 2009-12-22 16:41:21 -05:00
Loren Shih 36634bc1ec automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
2009-12-17 18:55:01 -05:00
Loren Shih 03c75c22f9 EXT-3329 : Able to delete system folder is confusing - disable from non-god mode
"Delete" no longer works for system folders.
Created a new "Delete System Folder" context menu entry that only works in RelWithDebug if only one item is selected.

--HG--
branch : avatar-pipeline
2009-12-17 18:47:58 -05:00
Loren Shih d3d454988a EXT-2677 : "Remove From Outfit" active even when I'm not wearing any items in the folder
Now checking contents of the folder for any actively worn items for determining this flag.

--HG--
branch : avatar-pipeline
2009-12-17 15:47:07 -05:00
Mike Antipov e0855e5249 Fixed major bug EXT-3498 (Sorting not working correctly in Favorites Bar)
- added sorting of Favorites items before reordering

--HG--
branch : product-engine
2009-12-17 18:34:50 +02:00
Loren Shih d2abd1779a EXT-3527 : Centralize calls to getIsItemWorn
Changed more functions to use get_is_item_worn.

--HG--
branch : avatar-pipeline
2009-12-16 18:21:37 -05:00
Loren Shih 95bbee6b0e EXT-3527 : Centralize calls to getIsItemWorn
Changed more functions to use get_is_item_worn.

--HG--
branch : avatar-pipeline
2009-12-16 17:02:02 -05:00
Loren Shih 7796fc6748 EXT-3527 : Centralize calls to getIsItemWorn
Moved function from llinventorybridge to llinventoryfunctions.

--HG--
branch : avatar-pipeline
2009-12-16 16:36:40 -05:00
Loren Shih 66e7ca7c7a EXT-2524 : Disable ability to make links manually in non-god mode
Non-god mode treatment of copy/paste is now consistent with 1.23 behavior, and "paste as linK" doesn't show up in non-god mode.

--HG--
branch : avatar-pipeline
2009-12-16 16:11:53 -05:00
Loren Shih f87dcc28fa EXT-2760 : Double-clicking an Object in inventory opens the permissions in the side tray
Double clicking on an object no longer brings up both the floater and sidetray (it only brings up the sidetray now).

--HG--
branch : avatar-pipeline
2009-12-16 13:53:19 -05:00
Loren Shih 4d4406820b automated merge avp->avp
--HG--
branch : avatar-pipeline
2009-12-15 19:17:30 -05:00
Loren Shih a162d6afda EXT-3304 : Can't reorder items in the Favorites accordions
Fixed a bug where addChangedMask(LLInventoryObserver::SORT) was being called before the new sort order was established.

--HG--
branch : avatar-pipeline
2009-12-15 19:16:42 -05:00
Brad Payne (Vir Linden) 2dd09062d1 menu separator fix
--HG--
branch : avatar-pipeline
2009-12-15 17:33:59 -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
Nyx (Neal Orman) 4cc5f81ddf EXT-3370 integrate tab-ification to appearance sidepanel
Moved elements around so that the bottom bar is contained in the outfits panel
XUI changes by erica/chuck/nyx
code changes by nyx

code reviewed by Bigpapi

--HG--
branch : avatar-pipeline
2009-12-14 17:17:40 -05:00
Brad Payne (Vir Linden) b8ac919d6f merge
--HG--
branch : avatar-pipeline
2009-12-12 15:50:01 -05:00
Brad Payne (Vir Linden) ae8c1d1ea8 For EXT-3264: Missing separators in inventory context menus - restore
--HG--
branch : avatar-pipeline
2009-12-11 18:49:29 -05:00
Loren Shih 99590047eb automated merge avp->avp
--HG--
branch : avatar-pipeline
2009-12-11 16:01:44 -05:00
Eric M. Tulla (BigPapi) 1f3a554709 Minor gcc compile fix
--HG--
branch : avatar-pipeline
2009-12-11 14:16:46 -05:00
Eric M. Tulla (BigPapi) f042f35381 Merge of viewer2 into avp branch
--HG--
branch : avatar-pipeline
2009-12-11 13:37:00 -05:00
Brad Payne (Vir Linden) 264446a5ce For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-10 19:35:58 -05:00
Brad Payne (Vir Linden) b131314dba Fix for r. click Edit on a link to wearable
--HG--
branch : avatar-pipeline
2009-12-10 18:39:44 -05:00
Brad Payne (Vir Linden) e7ef47e825 For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-10 18:19:23 -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
Brad Payne (Vir Linden) 6af53dd7e2 For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-10 15:31:08 -05:00
Loren Shih ca56ac2179 EXT-3329 : Able to delete system folder is confusing - disable from non-god mode
--HG--
branch : avatar-pipeline
2009-12-10 15:11:02 -05:00
Brad Payne (Vir Linden) 50a865e212 merge
--HG--
branch : avatar-pipeline
2009-12-09 19:15:30 -05:00
Brad Payne (Vir Linden) 522463108b For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-09 19:12:05 -05:00
Nyx (Neal Orman) 019fc57855 fix for linux build breakage, a LLPointer was being implicitly cast wrong
approved by Seraph

--HG--
branch : avatar-pipeline
2009-12-09 11:34:44 -05:00
Loren Shih d4b888d478 EXT-3133: Viewer crashes after deleting a Trash folder from the My Inventory accordion
Put in a quick fix so that folders can't be made reparented to their own children.

--HG--
branch : avatar-pipeline
2009-12-08 17:31:02 -05:00
Brad Payne (Vir Linden) 209a660f08 For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
--HG--
branch : avatar-pipeline
2009-12-07 17:56:34 -05:00
Brad Payne (Vir Linden) 16efeb8581 merge
--HG--
branch : avatar-pipeline
2009-12-04 19:01:31 -05:00
Brad Payne (Vir Linden) f017058345 For EXT-2845, EXT-2846: standardizing gesture context options to work like wearables and attachments
--HG--
branch : avatar-pipeline
2009-12-04 18:58:57 -05:00
Loren Shih 71cd24b479 EXT-3124 : Add lookup for finding all linked items to an item
Added ability to filter by UUID.  Work in progress.

--HG--
branch : avatar-pipeline
2009-12-03 21:32:03 -05:00
Eric M. Tulla (BigPapi) b05ebd8977 merge of viewer2 into avp branch
--HG--
branch : avatar-pipeline
2009-12-03 12:09:16 -05:00
Loren Shih c09b2bd9c9 EXT-3057 : Refine the context options that exist for broken links
EXT-2950 : Trying to waer a link or to "Find Original" of a link silently fails when original is deleted

Missing links are now handled correctly in the right-click context menu.

--HG--
branch : avatar-pipeline
2009-12-02 14:16:07 -05:00
Loren Shih 8fdd2e0b28 EXT-3028 : "Find Original" does nothing if floater inventory isn't open
Changed logic for getActiveInventory so that it considers InventorySP.
Removed getActiveInventory and replaced with getActiveInventoryPanel since that follows its current usage.
This currently contains a bug because the InventorySP always thinks it's open.

--HG--
branch : avatar-pipeline
2009-12-01 21:12:34 -05:00
Loren Shih 4916305ce1 EXT-3029 : Missing icons for broken item link / broken folder link
EXT-3024 : Broken links don't show up in inventory

Mocked up some link icons for broken links.  These need to be polished up.
Broken links now have an IT_ (instead of being IT_NONE) so that they're filtered correctly and thus can show up in inventory.

--HG--
branch : avatar-pipeline
2009-12-01 18:57:15 -05:00
Loren Shih 27351b8bf5 automated merge for viewer-2.0 -> avp.
--HG--
branch : avatar-pipeline
2009-12-01 12:52:21 -05:00
Brad Payne (Vir Linden) e8ec98c307 line ending fixes
--HG--
branch : avatar-pipeline
2009-12-01 12:06:31 -05:00
James Cook 957055396d merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp 2009-11-25 12:31:24 -08:00
James Cook 59eb8a43a4 Switched line endings to Unix. 2009-11-25 12:17:38 -08:00
Loren Shih 57bc7dc44f automated merge from viewer-2-0 pull -u 2009-11-25 12:01:05 -05:00
Brad Payne (Vir Linden) d159daa8d7 For EXT-2584: Select and rename new folder when creating new outfit
--HG--
branch : avatar-pipeline
2009-11-25 11:31:03 -05:00
Eric M. Tulla (BigPapi) c5ef834606 Fix for EXT-2667 - making sure inv_item isn't null 2009-11-25 11:21:08 -05:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
James Cook 458430be91 Removed include llnotifications.h from llfloater.h trying to speed builds
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-24 22:13:10 -08:00
Brad Payne (Vir Linden) c812c616ea merge
--HG--
branch : avatar-pipeline
2009-11-24 14:39:39 -05:00
Brad Payne (Vir Linden) fc6cfc27be Fix for EXT-2571 to accommodate accordion panels
--HG--
branch : avatar-pipeline
2009-11-24 14:37:48 -05:00
Brad Payne (Vir Linden) e1cd91de4e For EXT-2571: Right click context menu for Outfits
--HG--
branch : avatar-pipeline
2009-11-24 12:49:36 -05:00
Loren Shih e11d1c1d2b EXT-2705 : Remove (dont' just grey out) right-click context menu options for Links that aren't necessary
--HG--
branch : avatar-pipeline
2009-11-23 18:10:37 -05:00
Loren Shih 7e181025c0 EXT-2456 : Usability: Inventory > Clothing > context menu not intuitive
Context menu now fills in after folder contents are fetched.

--HG--
branch : avatar-pipeline
2009-11-20 15:38:50 -05:00
Loren Shih 56a861138b EXT-2675 : Folder that contains baseitems for COF doesn't load on first click
EXT-2456 : Usability: Inventory > Clothing > context menu not intuitive

RightClickFetchInventoryObserver now works correctly to update menu
FetchInventoryDescendents now triggers notifyObservers properly
Fixed up gInventory.notifyObservers logic

--HG--
branch : avatar-pipeline
2009-11-19 21:57:14 -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 afbc78d039 Merging viewer-2-0 changes into avatar-pipeline branch
--HG--
branch : avatar-pipeline
2009-11-19 13:36:27 -05:00
Bryan O'Sullivan 699eac4ee3 Switch some files to Unix line endings 2009-11-18 17:52:03 -08:00
Loren Shih 4a38c90adb EXT-2641 : Linked gestures aren't showing up as being worn (and possibly more serious problems with linked gestures)
Gestures now properly handle link indirection.
2009-11-18 17:03:17 -05:00
Loren Shih 5dea0791f7 EXT-2581 : Old items still display as "(worn)" even after I change outfits
Added gInventory.notifyObservers to idle callbacks so it gets triggered without explicit notifyObservers synchronization.
Added more state tracking for attachments, wearables, and links of those types, so that they're marked as changed properly.
2009-11-18 14:51:14 -05:00
Brad Payne (Vir Linden) 815f336a15 For EXT-2574, EXT-2577: remove from outfit now enforces mandatory body parts, teen underthings
--HG--
branch : avatar-pipeline
2009-11-18 11:23:59 -05:00
Loren Shih 0f94b7ac3d merge 2009-11-17 20:17:21 -05:00
Loren Shih a34c89df87 EXT-1916 : Landmarks are not sorted in the Favorites Bar accordion
Sorting was fixed when LLFolderViewFolder was added back into the inventory panels.  This checkin additionally allows sorting in the landmarks inventory panel.
2009-11-17 20:13:31 -05:00
Loren Shih ceee6c3e5e Header file cleanup.
Removed unnecessary headers from llinventorybridge.cpp.
2009-11-17 19:40:43 -05:00
Eric M. Tulla (BigPapi) 3217887356 Merge of viewer2 into avp
--HG--
branch : avatar-pipeline
2009-11-17 17:58:17 -05:00
Brad Payne (Vir Linden) 6474dbd469 For DEV-34652: OUTFITS (Operations) : Wear folders via drag and drop - handle untyped folder dragged to outfit
--HG--
branch : avatar-pipeline
2009-11-17 16:07:29 -05:00
Brad Payne (Vir Linden) 70b605e419 Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0
--HG--
branch : avatar-pipeline
2009-11-17 10:34:14 -05:00
Brad Payne (Vir Linden) 9c823a1d40 Deferring work to idle time to avoid recursive notifyObservers calls - added wrapper class to defer an arbitrary boost::bind or other callable
--HG--
branch : avatar-pipeline
2009-11-17 10:33:47 -05:00
angela bce2cab144 EXT-2317 I18N: use the localized names for [ATTACHMENT_POINT] in strings.xml WornOnAttachmentPoint 2009-11-16 21:27:08 +08:00
Eric M. Tulla (BigPapi) 15354ab16e EXT-2117 - Fix for not being able to add / remove multiple items of different types from your inventory 2009-12-01 20:01:19 -05:00
Loren Shih 42319d1ab8 Header file cleanup
Moved LLInventoryPanelObserver to be private to LLInventoryPanel

--HG--
branch : avatar-pipeline
2009-11-13 18:22:00 -05:00
Brad Payne (Vir Linden) cc72b78b5f Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
2009-11-13 16:49:36 -05:00
Brad Payne (Vir Linden) 2c05c3dab3 For DEV-41820: Allow dragging links to Looks and Current Look: copy the link, wear if Current Look
--HG--
branch : avatar-pipeline
2009-11-13 16:48:53 -05:00
Loren Shih f0cd44a6a2 EXT-2482 : Newly created folders have wrong default type
Removed AT_ROOT_CATEGORY and FT_ROOT_CATEGORY since those types are unused.  Changed FT_CATEGORY to FT_ROOT_INVENTORY to make its purpose more clear.

This change assumes that no agent inventories have category type 9 for either inventory type or folder preferred type.

--HG--
branch : avatar-pipeline
2009-11-13 16:18:53 -05:00
Brad Payne (Vir Linden) 581fccecc8 For DEV-41818 - text change 'Goto Link' -> 'Find Original'
--HG--
branch : avatar-pipeline
2009-11-13 15:47:49 -05:00
Brad Payne (Vir Linden) 4b05dc4890 LLAppearanceManager cleanup - 2 methods renamed
--HG--
branch : avatar-pipeline
2009-11-13 15:20:54 -05:00
Loren Shih 3b730cef75 merge
--HG--
branch : avatar-pipeline
2009-11-13 11:10:29 -05:00
Brad Payne (Vir Linden) f36c43abde branch merge
--HG--
branch : avatar-pipeline
2009-11-13 09:35:37 -05:00
Loren Shih 2886d0ec92 EXT-24131 : Diagnose warning spam: "WARNING: LLObjectBridge::performAction: object not found - ignoring"
This warning is a false positive, also existed in 1.23.  Removing.

--HG--
branch : avatar-pipeline
2009-11-12 20:29:48 -05:00
Loren Shih 2ea1b06440 Backed out changeset: 153709ddee86
--HG--
branch : avatar-pipeline
2009-11-12 20:29:07 -05:00
Loren Shih 1bbcc4be83 EXT-24131 : Diagnose warning spam: "WARNING: LLObjectBridge::performAction: object not found - ignoring"
This warning is a false positive, also existed in 1.23.  Removing.

--HG--
branch : avatar-pipeline
2009-11-12 20:21:33 -05:00
Nyx (Neal Orman) 31ceac8289 EXT-1796 right click menu has "take off items" for gestures
renamed "take off items" to "remove from outfit"

Code reviewed by Seraph
2009-11-12 19:16:01 -05:00
Brad Payne (Vir Linden) 0b104e2a41 LLAppearanceManager cleanup - turning into proper singleton
--HG--
branch : avatar-pipeline
2009-11-12 15:10:06 -05:00
angela 6106c9a7da Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-10 10:48:17 +08:00
Loren Shih c9937716aa EXT-1866 : Inventory Side Panel
Various trivial UI behavioral changes for disabling/enabling old/new floaters when bringing up properties of objects/items.
This is to make the UI behavior compliant with the Inventory Panel MVP.

Also added missing sidepanel_task_info.xml (although this is not actually enabled for viewer2.0).
2009-11-09 12:26:27 -05:00
angela 8ea12297e2 escape from infinitive loop of fetching inventory folder with NULL uuid 2009-11-09 13:34:32 +08:00
Steve Bennetts 8631443847 merge changes from product-engine 2009-11-06 18:13:38 -08:00
Loren Shih 9c048d12fd merge
--HG--
branch : avatar-pipeline
2009-11-06 18:31:52 -05:00
Loren Shih 2aa981ac23 EXT-2278 : "Save Texture As" for bottom panel
EXT-2310 : "Save Texture As" for inventory right-click menu

"Save Texture As" now works properly and brings up the texture preview while saving.
Also added "Save Texture As" to the right-click inventory context menu.

--HG--
branch : avatar-pipeline
2009-11-06 17:35:05 -05:00
Alexei Arabadji 8a4e36a9bd fixed EXT-2295 "'Group Chat' btn makes chicklet appear only"
--HG--
branch : product-engine
2009-11-06 19:31:27 +02:00
Loren Shih 7615ec497e EXT-2216 : Task properties sidepanel
EXT-2224 : Edit item then delete item -- edit panel still active
EXT-2228 : Buy/Pay/Open buttons for Task sidepanel

--HG--
branch : avatar-pipeline
2009-11-04 20:30:11 -05:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Loren Shih 5884c2fa4c EXT-2131 : object properties sidepanel
EXT-2128 : remove multi-properties ability, disable from inventory menu

Also includes llsidepanelinventory cleanup.

--HG--
branch : avatar-pipeline
2009-11-03 13:58:08 -05:00
Loren Shih 310a7b60f7 Merge conflict resolution for previous commit.
--HG--
branch : avatar-pipeline
2009-11-02 16:22:18 -05:00
Loren Shih bde7d67066 EXT-1866 : Inventory Side Panel
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel

Porting over changes from svn Inventory Panel work.
2009-11-02 15:39:55 -05:00
Erica 7e4394dbcd Added dummy icons for Tattoo and Alpha textures, pushed Lis' preferences changes for EXT-1927 2009-10-29 11:58:45 -07:00
Steve Bennetts 4ddaa866dd merge 2009-10-23 12:18:46 -07:00
Steve Bennetts 127b428863 merge 2009-10-23 12:15:22 -07:00
Loren Shih a5453d45fe For EXT-1863 : "Wear" and "Take Off" for items should be properly greyed out depending on item worn state 2009-10-23 17:41:32 +00:00
Loren Shih 584962d5c7 svn merge -r137024:137071 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14-seraph into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Bugs: EXT-1785 EXT-1818 EXT-1820 EXT-1845
2009-10-23 15:21:49 +00:00
angela 312cf3cf88 EXT-1698 I18N: the string (worn) or (worn on left hand) wont honor its translation 2009-10-23 20:07:53 +08:00
Loren Shih 67c4555a37 svn merge -r136533:136919 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
* Bugs: EXT-1779
2009-10-21 23:08:48 +00:00
Steven Bennetts 6f41747bc4 Merging revisions 2112-2128 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1605 EXT-1506 EXT-1663 EXT-1616 EXT-1599 EXT-1587
* Dev: EXT-748 EXT-1447
* IM Cleanup
2009-10-21 04:58:23 +00:00
Steven Bennetts fe9719e804 Merging revisions 2094-2099 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1612 EXT-1604 EXT-1163 EXT-1163 EXT-1167
* Dev: EXT-1516
2009-10-21 03:39:04 +00: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
Loren Shih 89d92267e2 svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-32867 : Avatar Pipeline Project - Multi-Attachments

This is a viewer-side-only, infrastructure-only merge for multi-attachments.  This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly.

Reviewed by: Vir.
2009-10-16 21:41:31 +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
Adam Moss 406927f629 Merge a big bunch of fixes from maint-viewer. Hooray.
svn merge -r136066:136073 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-24-qa-9

DEV-8553 New Server Tools - Prep Land For Sale
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-33239 VWR-13816: Resizing the Search Window Causes the Results to Refresh back to First Page
DEV-27746 Running a dev build of Second Life will make console window show up on non-dev builds (Windows)
DEV-33209 Linux 1.24.0.120778 client fails to run
DEV-29123 SVC-3871: Crash of viewer when clicking on ghost objects at (0,0,0) on a sim
DEV-35433 Attempting to upload wrong file type crashes viewer
DEV-33499 viewer2009 is not using KDU
DEV-33912 Griefing viewer crashes others' viewers with malformed sound files
DEV-3784 VWR-138: Animation Priority not working correctly, Can't create new AOs
DEV-20678 VWR-9069: Region variable says 'Region Name' in AR if no object is selected
DEV-19934 Help->About Second Life doesn't differentiate between 32- and 64-bit Vista
DEV-6604 Restored folders have 'Purge Item' and 'Restore Item' options
DEV-12867 VWR-5717: Selected Text is not replaced by Input text when Japanese IME is on
DEV-11894 Notecards/Texture windows don't open completely when opened from inventory
DEV-10641 VWR-4955: Local Chat doesn't show end of last conversation
DEV-30039 VWR-12620: Viewer build fails on Linux when compiled with -O2 (--type=Release)
DEV-20944 VWR-9065: (intermittent) Right Click >profile on avatar does not display profile
DEV-24828 Menu accelerator prefixes shouldn't be hard-coded
DEV-34529 VWR-14267: Clicking send in an IM window does not add the sent text to the line editor history
DEV-34124 Invite to group, search by name will not show resident if their first name is two characters
DEV-20930 VWR-9248: On Mac: the "--url" option causes a command line parsing error
DEV-35306 Adult keyword filter triggers multiple warnings
DEV-35503 VWR-3595: "Second Life requires True Color (32-bit) to run in a window" message is incorrect
DEV-35656 VWR-12995: FTBFS: error: format '%-3d' expects type 'int', but argument 3 has type 'size_t'
DEV-30043 VWR-12533: Linux viewer build for OpenAL fails during packaging unless FMOD library is available
DEV-31898 VWR-13202: Right clicking mouse triggers arrow key control events
DEV-32610 Keyboard shortcuts on OSX viewer overridden by OSX
DEV-27067 Coverity Prevent: EVALUATION_ORDER defects
DEV-26188 VWR-2242: Specially formatted .BVH file can cause avatar distortion
DEV-25475 About Land dialog no longer shows Area: field
DEV-19897 OSX Viewer Installer (for an RC) opens with poor positioning
DEV-22837 Inventory> Search Recent Items highlighting incorrect characters
DEV-21709 VWR-9377: Mapping will default to leave exact sim name listing first. (Searching Gar forces Gar to come up and not Garden of Dreams)
DEV-23079 implement volume serial for linux client
DEV-13930 VWR-6432: Space Navigator operation with vehicles is broken
DEV-27666 VWR-10829: Linux Viewer: CLICK_ACTION_PAY shows CLICK_ACTION_PLAY icon
DEV-23670 Viewer crashes on startup if installed into a custom folder with Korean, Japanese or Chinese characters in path
DEV-19313 VWR-8454: PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS not highlighted in script editor
DEV-19918 VWR-8885: Move character/*.xml files to source bundle
DEV-25555 VWR-11172: A source coding mistake prevents number-pad keys from specifying Ctrl+digit shortcuts on Windows
DEV-8536 VWR-4057: Multi-line chat display bug - first character in line missing
DEV-29592 Mac LLFastTimer uses wall clock instead of Intel PMU
DEV-29644 VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining
DEV-25320 VWR-11128: Python not always detected by develop.py
DEV-30040 VWR-12617: Poor type name that violates Coding Standard breaks compatibility with system header files
DEV-30380 indra/newview/res-sdl/toolpay.BMP is modified during ./develop.py configure
DEV-31247 VWR-12763: non-portable printf specifier used with size_t causes FTBFS on 64bit (due to -Werror)
DEV-29565 VWR-12569: A comment in lluistring.h contains undefined UTF-8 code sequences
DEV-22100 VWR-9620: send_parcel_select_objects in newview/llfloaterland.cpp uses the wrong datatype for the ReturnType field causing a warning
DEV-31911 Selected objects / primitives should be greyed out when nothing is selected
DEV-3667 Windows: Accelerator keys should be "Ctrl+X" rather than "Ctrl-X"
DEV-27223 disable gstreamer on 64-bit linux
DEV-8172 We Need a Linden Sale Option to Sell Land to Anyone
DEV-25511 VWR-10311: Enable LipSync by default
DEV-20443 Revamp group creation confirmation dialog to be more communicative
DEV-20132 VWR-7800: Joystick / SpaceNavigator. Camera should remain in position when exiting flycam mode into avatar mode.
DEV-18420 VWR-8393: Have build scripts copy fmod from an external location
DEV-24841 VWR-10717: Right Space Navigator button should toggle fly in avatar movment, not jump/flyup.
DEV-28457 change auto-populate value in buy L$ window from 1000 to 2000
DEV-15545 VWR-3725: Please add resize option to the SEARCH window UI
2009-10-14 10:40:56 +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
Steven Bennetts 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
Bradley Payne 7eca974a11 Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder, and EXT-1090: Attachments detach on login, as well as work in progress for ensemble support and look details. 2009-09-24 18:05:38 +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 79653dfed4 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3
* Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790
* New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788
* EXT-272 - Draggable Landmarks
* EXT-715 - Block List Panel
* EXT-782 - Implement advanced place information accordions
2009-09-07 22:55:07 +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
Bradley Payne 50f732bc01 For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder). Make sure that only wearables from the COF are handled as wearables during initial COF load. Added error checking for null asset IDs. This fixes a crash on login observed after loading from COF was enabled. 2009-08-18 20:18:40 +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 238b9a2e81 For DEV-37907 : Goto item should scroll inventory view to baseobj
Simple fix to scroll the inventory panel to show a folder if you select "Goto Link" from a folder link.
2009-08-13 00:48:49 +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
Steven Bennetts 0bf4b5f222 merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0
Fixes:
EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412
Other changes:
Movement & Caemra controls work
Profile and Me panel refactoring
Notification refactoring
2009-08-12 01:12:27 +00:00
Steven Bennetts 85f9400927 EXT-316 Enable the Viewer to generate calling cards for any agent
Added code to store agent ID in the description field of calling cards so that we can use them to store user generated contacts.
Currently enabled as a context menu for avatars (just for initial testing).
reviewed by richard
2009-08-05 01:05:39 +00:00
Richard Nelson 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
Loren Shih f5ba6df4c2 svn merge -r 127369:127511 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/landmark-permissions__merge__viewer2.0.0.3-r127280 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
includes post-merge fix for DEV-36563 : Remove mAcceptsCallingCardNames

For DEV-36496 : Viewer merge for Landmark & Callingcard Permissions [VIEWER]
For DEV-36563 : Remove mAcceptsCallingCardNames

Test plans - EXTERNAL
* [ Test against a 1.30 server ]
* Test various permissions operations - both on items in inventory, and rezzed items and items that are embedded in objects.
* Test creating landmarks.

Test plans - INTERNAL
* Test against any inventory permissions smoke tests.
* See test plans in QAR-1644 for full Landmark&Callingcard Permissions test plan.
2009-07-24 16:20:15 +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
Steven Bennetts 73a97010e6 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-07-21 00:57:23 +00:00
Neal Orman 56e0455479 QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branch
Merging changes for first checkpoint of multiple textures branch as part of the avatar pipeline project (AVP). Functionality should be same as before, but sets up the structure that later changes build upon. Changes passed QA, merge conflicts were minimal and easily resolved. Contact Nyx with any problems with this code.


 -Nyx
2009-07-14 15:14:46 +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