63adc57b38
Update 3 of SSB + RLVa
2013-03-05 18:57:27 -08:00
d74b2985a5
Merged with Appearance-MixedViewers tip
...
--HG--
branch : .RLVa
2013-03-03 13:13:22 +01:00
998c31ef9e
BUILDFIX fixing undefined reference in build
2013-02-26 15:29:23 -05:00
6425b3cd65
Merge RLVa SSB update
2013-02-24 18:24:48 -08:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
e1526c4048
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-20 14:26:21 +01:00
354ccc1640
additional safety check for bad appearance messages
2013-02-15 13:44:21 -05:00
72dfb2abce
SH-3812 WIP, SH-3852 WIP - some metrics cleanup, added rebake when needed and sb system is unavailable, to avoid stale appearance problems
2013-02-13 17:28:05 -05:00
b368a21202
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-04 21:06:34 +01:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
5b5f4c8bf5
Merge LL 3.4.2 release,
...
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
6ae4802e6d
merge
2012-07-30 19:10:46 -04:00
833d73d674
fix for SH-3235: Bump maps are not loaded until objects change LOD
2012-07-13 17:46:43 -06:00
409be9dcc4
SH-3267 WIP - extract cof version from avatar appearance message, use to reject stale updates
2012-07-13 16:59:57 -04:00
27c7b259b4
SH-3267 WIP
2012-07-12 18:24:23 -04:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
e4a0dda457
SH-3228 WIP - always respond to processAppearance for self, convert baked textures to checkerboards
2012-06-28 14:24:04 -04:00
07545e99fc
SH-2689 FIX - a bit more logging and related cleanup. Somewhat arbitrarily calling this done, although tweaks will be ongoing
2012-02-29 13:09:28 -05:00
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
2c584790d0
VWR-24487 make PREHASH variables char const* const
2011-04-01 09:14:52 -04:00
87dd359b1c
Opensim - detect and use various configuration limits which might be different from SL, by ArminW
2011-08-28 07:10:09 -04:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
5a34cf1af8
Merge from viewer2 trunk.
2010-01-28 12:48:48 -08:00
0d5a6ea3c0
CID-331
...
Checker: UNINIT_CTOR
Function: LLPrimitive::LLPrimitive()
File: /indra/llprimitive/llprimitive.cpp
2010-01-28 10:25:09 -08:00
4e420a36c6
Fix for missing LOD spam.
2009-11-07 08:22:39 -06:00
10069e0e13
Fix for prims all being 0 lod.
...
Fix for dangling prim references.
2009-11-05 19:58:10 -06:00
1c495c56c1
Fix for crash on teleport to mesh enabled region.
...
Fix for flashing meshes on LOD switch.
2009-11-05 17:12:18 -06:00
63b9bd43ff
Repairing things that didn't quite merge properly.
2009-11-02 14:56:46 -08:00
b81feb6ae7
Merge of viewer-2-0 changes
2009-11-02 14:16:08 -08:00
3e80fa3dbc
Sync up with render-pipeline-7 ignore-dead-branch
2009-11-02 19:55:37 +00:00
4d53e235c2
merge of latest viewer/viewer-20
2009-10-02 10:35:42 -07:00
dde2153014
merge of latest lindenlab/svn-imports-viewer-20
2009-10-01 18:19:45 -07:00
cf9239cabc
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
...
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +00:00
eca30a2262
QAR-1619: merge up to 2009-09-26 viewer/viewer-20
2009-09-30 21:42:04 -04:00
bc4444cd78
Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20
2009-09-26 18:08:24 -04:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +00:00
bb1d4592bd
Merged latest viewer/viewer-20 into login-api.
2009-09-18 15:22:25 -04:00
0f0853a6fe
Fix up some more post-merge breakage.
2009-09-01 18:16:04 -04:00
30ff6cabd6
Merge with trunk
2009-08-31 13:47:47 -07:00
87776b1944
svn merge -r128774:128808 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1737
...
effective merge: svn merge -r127126:128746 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27
2009-07-29 22:16:52 +00:00
a05617a654
svn merge -r 126003:126087 svn+ssh://svn/svn/linden/qa/light-texture-params/light-texture-params-2 into trunk
2009-07-07 18:30:20 +00:00
baa73fddd9
Merge with viewer-2.0.0-3 branch
2009-06-22 15:02:19 -07:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
01d390825a
DEV-27646 dll linkage for login module.
...
Ok, finally got this to a point where it doesn't break the build and I can check
in. llcommon can be built as a shared library (disabled but can be enabled with
cmake cache var LLCOMMON_LINK_SHARED.
reviewed by Mani on tuesday (I still need to get his suggested changes
re-reviewed)
2009-05-22 23:27:16 +00:00
3d4e04b556
QAR-1284 ip-takedown tools simulator work is ready for merge
...
svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5
no conflicts
2009-04-01 17:11:37 +00:00
46f8fb8781
svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22
...
Merge back of viewer 1.22 RC6 and RC7 change to trunk.
QAR-1214 and QAR-1227
2009-02-03 21:15:57 +00:00
Tank_Master