3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
dfff5a476c
SH-1289 VWR-25421 VWR-25415 FIX multiwearable "add" option disabled in inventory view
...
Corrected the XUI menu logic that was causing the "add" right click option to be greyed out
for clothing pieces that are valid for multiwearables.
2011-04-06 14:30:27 -04:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
634f152004
merge up to latest viewer-development
2011-02-08 11:57:38 -05:00
3f77074f27
Automated merge up from viewer-development into mesh-development
2011-02-04 11:23:56 -05:00
bcb95ed707
STORM-397 FIXED Disabled dropping wearables from a notecard to COF and any outfit folder.
...
Those folders should contain only links to wearable items.
2011-01-25 21:10:00 +02:00
b01ca1293b
merge up to latest viewer-development
2011-01-13 11:14:13 -05:00
7c7527b672
Automated merge up from viewer-development
2011-01-05 15:10:39 -05:00
83eb22f736
SH-739 Meshes can no longer be moved into subfolders of the "Meshes" folder
...
Did this ever work? The code for handling drag&drop is broken completely for meshes; you can't drag them anywhere in inventory.
Also did some formatting/cleanup of related code.
2011-01-04 18:41:36 -05:00
05810f063d
merge changes for storm-737
2011-01-04 16:43:26 -05:00
433ad05ae9
merge up to latest viewer-development
2010-12-27 14:29:11 -05:00
971eb7f198
STORM-737 Inventory/Recent: Gray out "New Folder" in "+" menu and enable all menu items except "New Folder" when right clicking an item.
2010-12-23 15:56:15 -05:00
ee0055f5af
Automated merge up from viewer-development
2010-12-16 11:12:15 -05:00
73962e2134
STORM-771 FIXED Pasting wearable items from clipboard to Current Outfit or an outfit folder now creates links to these items.
2010-12-16 00:50:03 +02:00
efa42a6aab
merge up to viewer-development
2010-12-04 09:14:58 -05:00
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
accbddaead
STORM-283 : merge with viewer-development
2010-11-02 17:31:01 -07:00
f4a99d359c
STORM-287 FIXED changing currnet outfit with an outfit dragged from Library to My Inventory->Current Outfit folder.
2010-11-01 23:52:09 +02:00
cace89d2e9
STORM-283 FIXED adding attachments of type LLInventoryType::IT_ATTACHMENT to Current Outfit.
2010-11-01 23:50:31 +02:00
9c8ce6d6dc
STORM-296 FIXED Item types that can be dropped to Favorites and Landmarks restricted to landmarks and folders containing landmarks.
...
This changes affect all folder views. The previous fix affecting only My Landmarks SP (changeset 330d0e96d58d) was reverted.
2010-10-27 19:01:38 +03:00
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
cf09d6c58a
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
2010-09-22 03:04:21 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
60db8577a9
Merge
2010-09-16 12:02:24 -07:00
bf7201cf8b
dummy commit test
2010-09-09 17:06:37 -04:00
f981e5af3f
dummy commit test
2010-09-08 17:15:58 -04:00
4a8d59367a
dummy commit test
2010-09-08 16:27:42 -04:00
074f4c8c59
VWR-22901 FIXED Backwards compatibility for multiattachments
...
Better handling of invalid attachment points.
You can now detach points that are incompatible with your viewer, versus having those permanently in the COF>
2010-09-08 13:36:42 -04: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
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
592ebc9ec6
VWR-22695 FIXED Adding attachments messaging is inefficient
...
Superficial code cleanup of RezAttachment messaging.
2010-09-02 15:34:54 -04:00
0440fe4dcc
VWR-22695 FIXED Adding attachments messaging is inefficient
...
Single attachment request are now batched up and sent all at once as a single message.
2010-09-01 12:02:48 -04:00
73db0816e0
STORM-199 FIXED Added wearing an object from Library if it was dragged to COF
...
- Disabled moving items from in-world objects to COF or outfit folders not to create copies of items instead of links.
- Enabled dropping a landmark from Library to certain position in Favorites folder which supports items reordering.
2010-09-23 01:34:51 +03:00
8eb6c6dec8
STORM-183 ADDITIONAL FIX Disabled the "Replace Current Outfit" option of the inventory context menu for incomplete outfits.
2010-09-17 22:52:51 +03:00
2f012dd34f
merge
2010-08-25 14:48:18 -05:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
782a0cf811
Fixed backwards compatibility so that orig Breast params are preserved.
...
Cleaned up some code.
Removed "Add" from right-click when multiwear is not permitted.
2010-08-23 17:12:10 -04:00
981a43b355
Created new wearable type.
...
Added debug setting for disabling physics.
Added disable-multiwear and disable-camera-reset to wearabletype.
2010-08-23 16:13:10 -04:00
b5a8534116
(final?) hairy merge from viewer-release to viewer-public
2010-08-17 11:41:12 -07:00
738dde2053
(final?) hairy merge from viewer-release to viewer-public
2010-08-17 11:41:12 -07:00
6c8494295a
Merge from default branch
...
--HG--
branch : product-engine
2010-08-16 15:35:40 +03:00
462b629be5
Merge from default branch
...
--HG--
branch : product-engine
2010-08-16 15:35:40 +03:00
d77c3e3600
merge
2010-08-13 14:39:04 -04:00
635b3edaaf
merge
2010-08-13 14:39:04 -04:00
37a0124bfd
DEV-52580 FIX
2010-08-13 14:33:30 -04:00
Dave Parks