2be388c7e0
Merge Firestorm LGPL
2015-09-30 10:41:43 +02:00
b9746dde29
Merge viewer-bear
2015-09-15 01:39:31 +02:00
ec0804a5f7
merge
2015-09-14 17:35:28 -04:00
6b2c1d5f10
SL-133 WIP, SL-134 WIP - more extra joint handling
2015-09-14 11:01:22 -04:00
e861273da8
Merge viewer-loader-mods
2015-08-29 14:14:08 +02:00
5fe09cb64d
Merge Viewer-Bear
2015-08-22 03:13:17 +02:00
bb7ac16318
MAINT-5532 FIXED upload of duck.dae from MAINT-4483 crashes mac viewer
2015-08-20 20:25:58 +03:00
272bce84a6
FIRE-16588: Replace llround with ll_round in Firestorm-specific code
2015-08-06 22:56:41 +02:00
d9341caf45
MAINT-5364 FIXED Object with invalid sculpt topology type cannot be seen or selected
2015-07-17 17:36:33 +03:00
d43cef4ed5
MAINT-5364 FIXED Object with invalid sculpt topology type cannot be seen or selected
2015-07-14 16:29:36 +03:00
5f397bdd18
Merge from viewer-release
2015-04-29 15:28:21 +03:00
75ffe90b0c
MAINT-5042 FIXED SL Viewer Closes Unexpectedly in specific area with high RenderVolumeLODFactor
...
- fix for review
- fix in buffer overrun detector
2015-04-27 18:21:39 +03:00
1dd7e76908
Merge with viewer-release and become 3.7.28
2015-04-14 18:53:17 +03:00
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
e76f352501
MAINT-5042 FIXED SL Viewer Closes Unexpectedly in specific area with high RenderVolumeLODFactor
...
- fix for review
- fix in buffer overrun detector
2015-04-27 18:21:39 +03:00
c7ab05651d
Get rid of LNK4221 linker warnings since we don't run the unit tests anyway
2015-05-15 20:17:33 +02:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
9be423524d
Merge LL V3.7.27
2015-04-14 22:08:31 +02:00
6c1e1760e4
FIRE-14525: Pull relevant part for current version of fix for MAINT-4435
2015-04-06 18:52:08 +02:00
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
10390bc470
Fix merge error
2015-02-20 09:22:11 -08:00
c5f281913e
Merge downstream code
2015-02-19 17:22:13 -08:00
96e5fc9f9b
MAINT-4329 Backed out changeset: fd3a4d5c2cf5
2015-02-14 00:08:39 +02:00
7869b9a73d
merge changes of 3.7.23-release
2014-12-19 23:18:21 +02:00
4c597c548f
Fix up remaining llround() -> ll_round() issues
2014-12-12 11:03:56 -08:00
ddf0f7a915
Another round of ll_round()
2014-12-12 08:54:34 -08:00
115cd1d4e6
Fix a couple more ll_round() calls
2014-12-11 13:30:25 -08:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
1be14992c6
MAINT-3494 FIXED Generate Normals checkbox does not control generation of normals.
...
Patchset #2
2014-12-02 12:09:50 +02:00
b3c8a559f6
MAINT-3494 FIXED Generate Normals checkbox does not control generation of normals.
2014-11-28 18:17:54 +02:00
4364a8cccd
MAINT-3529 FIXED Certain pathcuts made to a cube cause some faces to not react to sunlight or local lights
2014-11-24 18:41:51 +02:00
78a75ca00f
Cinder pointed out my fix here for clang pickiness was different from hers so I investigated and this is the causes of the slowdown - wrongly placed parens
2014-11-14 14:52:12 -08:00
ee5463a903
Reworked changes to more closely match Cinders' - hers seem more correct
2014-11-14 14:50:50 -08:00
799d13269a
MAINT-3585 FIXED Viewer Crashes when attempting to upload image.
...
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.
All changes described here.
Сhange's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h
Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h
Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp
Unused condition and variables.
indra/llmath/llsphere.cpp
Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp
Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +02:00
b008385a50
FIRE-12732/MAINT-3585 FIXED Viewer Crashes when attempting to upload image
...
on OS X.
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.
All changes described here.
Change's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h
Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h
Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp
Unused condition and variables.
indra/llmath/llsphere.cpp
Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp
Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +02:00
4701a2b215
FIRE-15667: Added option to create 24bit depth maps to the snapshot floater; patch contributed by Sempervirens Oddfellow
2015-03-09 10:59:56 +01:00
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
a1fd8230bf
Merge LL V3.7.12
2015-01-12 17:56:50 +01:00
a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01:00
366bcd0cbc
MAINT-4435 FIXED fix in llvolume.cpp Perform full build if number of vertices
...
less than allowed. Changes in all other files relate auxiliary methods for
catching similar bugs in future.
2014-10-27 17:10:08 +02:00
da97612b98
Update to build on Xcode 6.0: removed bunch of unused consts variables [-Wunused-const-variable]
2014-10-17 14:34:37 -07:00
07fd457e13
Update to build on Xcode 6.0: various scoping issues with octree code
2014-10-17 14:31:54 -07:00
a38e89bf11
Update to build on Xcode 6.0: clang detecting unsigned int comparison with >=0 [-Wtautological-compare] - confirmed fix with davep
2014-10-17 14:27:56 -07:00
c02ba7ceb5
Update to build on Xcode 6.0: collection of similar possibly incorrect logical comparison grouping [-Wlogical-op-parentheses] fixes for clang
2014-10-17 14:17:58 -07:00
8db1250b73
Update to build on Xcode 6.0: collection of similar const var not used warnings/errors [-Wunused-const-variable]
2014-10-17 14:08:58 -07:00
41170b5603
MAINT-4329 FIXED scales each image *twice* for no apparent reason : patchset #2
2014-09-25 21:19:17 +03:00
a4fc0b26b0
MAINT-3511 FIXED When one surface of mesh object is set transparent all object is invisible : compare rotation quaternions with predefined epsilon
2014-08-18 15:12:16 +03:00
db43a0560c
Merge viewer-release
2014-07-31 08:40:57 -07:00
76e7f978c1
Merge viewer up to 3.7.12, including fixing missed LL_WARNS etc from last release (is that trout you smell on the air? is it?)
2014-07-07 17:59:07 -07:00
3e6698073c
Merge viewer-release and become version 3.7.12
2014-07-07 14:49:45 -07:00
Ansariel