Commit Graph

884 Commits (01d8e7e34706d19bd5faa4906abe41d0eaa37237)

Author SHA1 Message Date
Ansariel 01d8e7e347 Merge axon 2017-09-20 01:09:14 +02:00
Mnikolenko Productengine ba92c6150a MAINT-7745 FIXED After editing an outfit, duplicate photos appear in the Outfit Gallery for outfits that previously had no photo. 2017-09-04 16:51:22 +03:00
andreykproductengine 13328aa403 MAINT-7665 Remove menu option should delete both links and images 2017-08-23 21:20:45 +03:00
Brad Payne (Vir Linden) 72010fba4d SL-718 - bug fixes for animated objects as attachments: Pause all associated avatars when selecting/editing. Don't apply joint positions to the attached avatar on login. 2017-08-04 16:20:04 +01:00
Ansariel 95fcf065c1 Merge viewer-bear 2017-04-19 21:43:58 +02:00
andreykproductengine 306cec78aa MAINT-7249 Fixing obsolete suffix for wearables that are no longer worn 2017-04-05 19:34:04 +03:00
Ansariel 80f2d2f827 Merge LL Viewer release 5.0.2 2017-03-06 21:35:23 +01:00
andreykproductengine 535f5c5120 MAINT-7161 Crash in LLViewerInventoryItem 2017-03-01 19:26:26 +02:00
Ansariel 366b684300 Merge viewer-bear 2017-02-03 20:14:11 +01:00
andreykproductengine fd81f83f6b MAINT-2438 Fixes wrong permissions source 2017-02-03 20:14:42 +02:00
Ansariel dd69a22834 Merge viewer-bear 2017-01-27 09:42:51 +01:00
andreykproductengine c4476c78f1 MAINT-2438 When wearing 2 pair of identical pants, only one pair was editable 2017-01-04 10:51:52 +02:00
Ansariel 8c083cf771 Merge Firestorm LGPL 2016-12-05 22:40:59 +01:00
Ansariel e2b86ee754 Merge viewer-lynx 2016-12-05 21:56:45 +01:00
AndreyL ProductEngine 2abd0eef41 Merged in lindenlab/viewer-release
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
Ansariel 16acd2d20a Merge Firestorm LGPL 2016-12-04 14:05:44 +01:00
Ansariel 1f1ea62a40 Merge Firestorm LGPL 2016-12-04 12:44:37 +01:00
Kitty Barnett 4503a28aee Merged with RLVa fixes 2016-12-03 17:13:17 +01:00
andreykproductengine bd411d4503 MAINT-6562 Avatar COF was occasionally failing to update because Not Found 2016-12-01 13:58:24 +02:00
Ansariel 5a58635b64 Merge Firestorm LGPL 2016-11-16 16:11:56 +01:00
Brad Payne (Vir Linden) d31596db6a merge 2016-11-16 08:39:41 -05:00
Ansariel c182741596 Merge viewer-lynx 2016-11-16 09:55:54 +01:00
Ansariel 1824cb9d82 Merge Firestorm LGPL 2016-11-15 12:17:59 +01:00
AndreyL ProductEngine 7fceb3a63f Merged in lindenlab/viewer-cleanup 2016-11-14 22:04:37 +02:00
Kitty Barnett 4e99177b14 Merged with Appearance-Misc tip
--HG--
branch : RLVa
2016-11-14 20:15:31 +01:00
Kitty Barnett bac1de6c68 Reviewed Appearance-SyncAttach for Catznip-R11
-> none of the work on AIS fixes the original problem from 6 years ago (see VWR-18512 and previous changesets in Appearance-Misc patch branch)
  -> Repro:
       * folder with 1 attachment and 2 wearables
       * double-click (in rapid succession) wearable 1, then attachment A and finally wearable 2
       => after double-clicking wearable 2 the attachment will end up detached

--HG--
branch : Appearance-Misc
2016-11-14 20:12:11 +01:00
Ansariel 3fed6c743a Merge Firestorm LGPL 2016-11-11 16:04:29 +01:00
Ansariel e9b067d7db FIRE-16794: Selecting and wearing multiple bodyparts only wears one of them 2016-11-07 14:14:45 +01:00
Ansariel 42c77ab5bc Merge Firestorm LGPL 2016-11-04 12:52:13 +01:00
Ansariel 79b11ddfd9 Merge Firestorm LGPL 2016-10-26 19:37:10 +02:00
Ansariel 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
Ansariel a1023dd89c Merge viewer-bear 2016-10-10 22:19:33 +02:00
AndreyL ProductEngine 8006d0e628 Reverted 208c0e0 2016-10-04 00:31:40 +03:00
Rider Linden 5ff1be79a3 Merge 2016-10-03 10:37:33 -07:00
Kitty Barnett c3c7e97eed Merged with default tip (Revision 353c4cb529e2)
--HG--
branch : Appearance-Misc
2016-10-02 19:55:19 +02:00
Ansariel ef3b8ad594 Merge bento-box 2016-09-28 14:45:26 +02:00
Brad Payne (Vir Linden) 996861e21b merge 2016-09-27 08:03:48 -04:00
Rider Linden bee933049f Merge 2016-09-26 10:55:25 -07:00
Rider Linden 9e25ba2390 Back out a change that never got merged into viewer-release. 2016-09-26 10:54:07 -07:00
Rider Linden 42dce67664 Merged lindenlab/viewer-release into default 2016-09-26 10:39:21 -07:00
Nat Goodspeed 099e3b4166 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2016-09-16 11:04:12 -04:00
Ansariel c04b9df0bb Merge Firestorm LGPL 2016-09-15 23:56:09 +02:00
Ansariel f0366fa155 Merge latest fixes from viewer-vob that didn't get into viewer-release yet 2016-09-15 23:32:34 +02:00
AndreyL ProductEngine 8c5e92a399 Merged in pavelkproductengine/visual-outfit-browser 2016-09-15 23:22:58 +03:00
AndreyL ProductEngine c2b6620572 Merged in lindenlab/viewer-release 2016-09-15 23:21:15 +03:00
Ansariel 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
Mnikolenko Productengine 07cc376831 MAINT-6718 Can't Wear - Replace current outfits. 2016-09-13 13:02:20 +03:00
Ansariel 788bd9e477 Merge viewer-vob 2016-09-07 21:42:28 +02:00
Mnikolenko Productengine 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
Mnikolenko Productengine fc17f62335 MAINT-6685 [VOB] Outfit Image from an Outfit Gallery disappears after editing outfit 2016-09-05 17:32:50 +03:00