5a58635b64
Merge Firestorm LGPL
2016-11-16 16:11:56 +01:00
1824cb9d82
Merge Firestorm LGPL
2016-11-15 12:17:59 +01:00
3fed6c743a
Merge Firestorm LGPL
2016-11-11 16:04:29 +01:00
e9b067d7db
FIRE-16794: Selecting and wearing multiple bodyparts only wears one of them
2016-11-07 14:14:45 +01:00
42c77ab5bc
Merge Firestorm LGPL
2016-11-04 12:52:13 +01:00
79b11ddfd9
Merge Firestorm LGPL
2016-10-26 19:37:10 +02:00
b834eb0052
FIRE-12004: Unset region crossing state when changing outfits as a way to fix a stuck region crossing state
2016-10-24 12:58:07 +02:00
a1023dd89c
Merge viewer-bear
2016-10-10 22:19:33 +02:00
8006d0e628
Reverted 208c0e0
2016-10-04 00:31:40 +03:00
5ff1be79a3
Merge
2016-10-03 10:37:33 -07:00
ef3b8ad594
Merge bento-box
2016-09-28 14:45:26 +02:00
996861e21b
merge
2016-09-27 08:03:48 -04:00
bee933049f
Merge
2016-09-26 10:55:25 -07:00
9e25ba2390
Back out a change that never got merged into viewer-release.
2016-09-26 10:54:07 -07:00
42dce67664
Merged lindenlab/viewer-release into default
2016-09-26 10:39:21 -07:00
c04b9df0bb
Merge Firestorm LGPL
2016-09-15 23:56:09 +02:00
f0366fa155
Merge latest fixes from viewer-vob that didn't get into viewer-release yet
2016-09-15 23:32:34 +02:00
8c5e92a399
Merged in pavelkproductengine/visual-outfit-browser
2016-09-15 23:22:58 +03:00
c2b6620572
Merged in lindenlab/viewer-release
2016-09-15 23:21:15 +03:00
78407979d4
Backed out changeset 1117ffe42799 (FIRE-11920: Always enable replace outfit from inventory) - there is a better fix from LL coming up in next merge
2016-09-13 18:55:58 +02:00
07cc376831
MAINT-6718 Can't Wear - Replace current outfits.
2016-09-13 13:02:20 +03:00
788bd9e477
Merge viewer-vob
2016-09-07 21:42:28 +02:00
ec9b92d274
MAINT-6698 [VOB] "Save" button is always enabled for outfit with non-default image even if there were no changes
2016-09-06 14:07:20 +03:00
fc17f62335
MAINT-6685 [VOB] Outfit Image from an Outfit Gallery disappears after editing outfit
2016-09-05 17:32:50 +03:00
a2875ba53e
merge
2016-09-02 14:34:06 -04:00
d258fe4035
Merge
2016-08-17 12:42:14 -07:00
1edf48a0c7
Put bake request back in AIS queue. Don't rerequest bake.
2016-08-17 12:39:54 -07:00
05e77c5f26
Merge VOB with 4.0.8-release
2016-08-16 20:40:57 +03:00
ef59928719
Clean up
2016-08-12 00:33:45 +02:00
18da7f067b
Merge Firestorm LGPL
2016-08-12 00:32:35 +02:00
3fe595953f
Initial merge of viewer-vob - viewer starts, but still lots of bugs and crashes
2016-08-08 12:46:44 +02:00
1b61408c97
Merge firestorm-lgpl-lynx
2016-07-26 19:30:33 +02:00
b8f2d2801b
Merge Firestorm LGPL
2016-07-26 18:42:13 +02:00
55231519c7
Merge viewer-bear
2016-07-18 14:32:34 +02:00
799f21616c
MAINT-6520 Add a way to see worn temp attachments.
2016-07-18 11:26:39 +03:00
6b49cd5816
Merge firestorm-lgpl-lynx
2016-07-13 10:46:40 +02:00
2c4f6131bc
Merge Firestorm LGPL
2016-07-13 09:05:54 +02:00
68e034f72b
FIRE-11920: Always enable replace outfit from inventory
2016-07-21 23:32:38 -07:00
05d22f77ae
Merged with RLVa tip
2016-07-11 22:44:01 +02:00
bb9affd554
[FIXED] @unsharedunwear=n doesn't block "Remove from Outfit" (if no attachment/wearable locks exist)
...
-> see previous commit as well
-> lookups ended up refreshing before the actual attachments were attached leaving them (from a user's perspective unpredictably) detachable
--HG--
branch : RLVa
2016-07-10 17:45:30 +02:00
7bfd26e3df
[FIXED] @unsharedwear=n doesn't block "Add to Outfit" (if no attachment/wearable locks exist)
...
-> wearables would be properly filtered if there was at least one wearable lock
-> attachments would be properly filtered if there was at least one attachment lock
=> added explicit check for add-restricted folders
=> gray out the relevant context menu items (i.e. "Add to Outfit" and "Replace Current Outfit)
--HG--
branch : RLVa
2016-07-10 16:40:20 +02:00
ea28514d3b
Merge Firestorm LGPL
2016-07-04 16:10:45 +02:00
afc06fd0b7
Sync llappearancemgr.cpp with V3
2016-06-30 23:16:51 +02:00
e4c1b08651
Merged with lgpl tip
2016-06-24 19:41:03 +02:00
1c7b227637
Merged with RLVa-refactor tip
2016-06-11 02:36:07 +02:00
f307125f61
Get conflicing AIS-fixes out of the way
2016-06-09 23:10:40 +02:00
29078e7696
MAINT-6473 Request for Drag & Drop functionality for adding images to Outfit Folders
2016-06-08 16:08:36 +03:00
3a53109152
SL-395 - support scale overrides (currently no way to get these into a dae, so the actual scale values are fabricated at run-time based on the joint name)
2016-06-07 10:39:32 -04:00
cb968152b0
Merge viewer-bear
2016-05-28 14:34:35 +02:00
e3c4f5554a
FIRE-19486: Manually dropping in Rider's fix for avatar bakes often fail after coroutine merge
2016-06-17 08:55:03 +02:00
Ansariel