a0837a5298
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-14 13:46:29 +01:00
c9343c4004
DRTVWR-543 Post-merge build fix
2021-11-19 06:05:45 +02:00
9a1af101cd
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llvoicevivox.cpp
2021-11-19 04:38:19 +02:00
9aa5be79d9
SL-4250 Do not allow editing worn items if items or avatar are not yet loaded
2021-09-07 23:47:16 +03:00
abc27703e6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-03 22:50:13 +01:00
f7bd33161b
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-12 11:05:22 +01:00
c9f988f621
Fix build
2020-11-12 08:47:12 +01:00
92af5af736
Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
2020-11-11 23:34:37 +02:00
46ebe69f32
SL-14303 Fix LLWearableType to not spam in logs
2020-11-10 18:18:51 +02:00
e7c9024d75
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-03 12:28:08 +02:00
5a44656a26
SL-13337 Remove teen account limitations concerning undergarments
2020-05-28 16:19:53 +03:00
5ea49864f7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-01-31 09:49:37 +01:00
39d59396d9
BOM for OS
...
replace static LLVOAvatar sMaxBakes with region based maxBakes()
Add additional guard on skirt rendering
member varts mMaxBakes and mMaxTEs on voregion
OPENSIM only drive maxBakes/TEs from Sim features
move rebake required detection out of voavatar, to avatartself
ADDITIONAL: prevent sending of skirt bake when not required
2020-01-11 21:12:10 +00:00
f61a5c4642
Merge viewer-release 6.3.6 into viewwer-eep repo
2019-12-16 12:47:19 -07:00
da365b227e
Merge Firestorm LGPL
2019-12-13 18:15:19 +01:00
8afa4331e0
Merge Firestorm LGPL
2019-12-12 19:48:36 +01:00
39617f8608
FIRE-29204 BoM fallback safety measures to protect legacy OpenSim.
...
limits bakes sent to the server depending on detected BOM capability.
initial tests on current OS tip and pre-BoM 0.9, needs more tests on other vers
2019-12-10 13:44:32 +00:00
a154630ecd
Merge 494-maint-wassail
2019-11-19 21:51:54 +01:00
6ec37fac60
SL-12196 Crash at updateMeshTextures
2019-10-29 22:37:02 +02:00
de837a5800
Merge Firestorm LGPL
2019-08-27 19:04:14 +02:00
723f1891db
Merge 6.3.1 viewer-release
2019-08-26 12:35:18 -07:00
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
9944015842
Merge viewer-baking-updates
2018-08-03 13:21:08 +02:00
7318bd61f7
[MAINT-8873] - check for bakesOnMesh enabled sim feature, before creating universal wearable type
2018-07-19 22:46:03 +05:30
b766466b30
Added settings inventory object with subtype
2018-02-26 09:27:14 -08:00
9153b343f2
Merge viewer-bear
2016-07-26 19:55:17 +02:00
f0ab36aec5
build fix
2016-07-26 16:12:53 +03:00
c8d682484c
MAINT-6566 Avatar sliders display incorrect values immediately after saving a copy of the wearable.
2016-07-26 11:31:37 +03: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
54ad513fcb
Merge viewer-bear
2016-06-24 11:35:43 +02:00
0070a5f964
MAINT-6490 Newly created inventory reports version mismatch
2016-06-17 19:04:10 +03:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
68739bc569
Merge Viewer-Bear
2015-10-27 01:31:15 +01:00
017a564999
MAINT-5742 FIXED Appearance window progress indicator spins after changing to an identical outfit
2015-10-19 17:04:38 +03:00
8b5c8c7f5b
MAINT-5742 FIXED Appearance window progress indicator spins after changing to an identical outfit
2015-10-19 12:46:59 +03:00
5b846a91cf
Merge Firestorm tip
2015-07-18 16:37:52 +02:00
6e9905881e
Merge with general/AIS/big bird appearance and RLVa fixes + general RLVa code sync madness
2015-07-18 03:51:33 +02:00
e03c133750
Merge from viewer-relese and become version 3.8.2
2015-07-15 14:59:32 +03:00
7fa9ac3ddb
Merged with Appearance-Misc tip for big bird
...
--HG--
branch : RLVa
2015-06-25 19:26:11 +02:00
eed94f728f
Merged with default tip (Revision a82eb9becc15)
...
--HG--
branch : Appearance-Misc
2015-06-25 01:24:12 +02:00
e396790bc9
Merged with default tip (Revision a5fd4c198756)
...
--HG--
branch : Appearance-Misc
2015-06-23 22:00:42 +02:00
a45d3d8421
Merge Viewer-Bear
2015-06-20 15:35:15 +02:00
b59770199a
Merge from viewer-release
2015-06-05 16:30:04 +03:00
2caa5273be
Merge Viewer-Big Bird
2015-06-04 15:59:17 +02:00
9e3eb8991d
merge
2015-05-27 11:08:45 -04:00
0e2a827873
Merge LL V3.7.30
2015-05-27 00:27:29 +02:00
316bdc0ab0
Merge viewer-release and become version 3.7.30
2015-06-08 14:54:22 -07:00
717fe350ab
Merged with default tip (Revision 21395c439e73)
...
--HG--
branch : Appearance-Misc
2015-04-27 20:55:19 +02:00
Ansariel