befb4449dc
MAINT-3585 FIXED (Crashes when attempting to upload image.)
2015-03-30 20:11:27 +03:00
0c709f7e5e
Improved check + EOL
2015-03-26 21:51:28 +01:00
a84cad1d7d
FIRE-15787: Crash fix
2015-03-26 21:17:35 +01: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
546b276eba
Fix merge issue
2015-01-18 17:18:23 +01:00
48fc17d6e1
Merge LL V3.7.16
2015-01-14 17:36:30 +01:00
a1fd8230bf
Merge LL V3.7.12
2015-01-12 17:56:50 +01:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
592024b580
Merge viewer-release and become version 3.7.9
2014-06-17 10:40:42 -07:00
61f3bf8a47
MAINT-4137: Correcting a potential crash. This change should fix the most probable location of a callstack being reported by the crash reporter. However, there is no reproduction yet, so hard to test whether this actually patches the crash occcurrence.
2014-06-06 19:30:41 +01:00
bde6023286
MAINT-4137: Correcting some poorly written CPP code that could potentially lead to problems in the future.
2014-06-06 19:28:18 +01:00
47a5e1c751
MAINT-4009: Ensuring that the local bitmaps are cleaned up on app exit.
2014-06-05 23:15:43 +01:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
a5568f942b
Merge downstream version 3.7.8 code
2014-05-07 15:28:13 -07:00
c8e4f2b10e
MAINT-4004 FIXED Check image's dimensions and show notification if it's larger than allowed.
2014-05-07 11:46:47 +03:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
9a8afee83f
SH-3455 WIP - removing bake upload code
2013-09-19 17:52:58 -04:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ad89d26dc6
norspec-107: remove the need for a friend declaration in local textures
2013-05-24 12:55:52 -04:00
c3804fd041
MATBUG-8: fix local texture support for normal and specular maps
2013-05-24 11:47:06 -04:00
6b81b8629e
Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies
2013-05-05 17:45:35 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
41ca92c67c
NORSPEC-54 Potential fix for crashing on all sorts of random operations.
2013-03-25 18:27:07 -05:00
5a436e46f6
SH-3959 WIP - pass information about type of fetched image - server bake, host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
2013-03-08 17:07:17 -05:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -05:00
aaf96507a1
Some Mac header #defines macros like check and equivalent -- gack!!
...
Given that third-party libraries (such as Boost) can and do use those names,
properly namespace-scoped, it's unpardonable to break any such innocent usage
with a macro. Given the pervasiveness of the need, introduce a header file
with the requisite #undef directives.
2012-11-16 18:08:40 -05:00
85d0bcc063
Extracted mWearableDatas from LLAgentWearables into llappearance/LLWearableData. Moved LLDriverParam into llappearance
2012-09-06 02:53:55 +00:00
1f6e20c5bb
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
2012-09-04 17:43:08 +00:00
21c364c4d4
Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines
2012-09-03 09:10:24 +00:00
c355fb98d3
Extracted texture baking system into llappearance library.
2012-09-03 06:12:50 +00:00
1d0498421d
Merge SSA push 5 (part1, pre CHUI stuff)
2013-03-19 16:34:59 -07:00
b7c25b12e2
Partial merge of LGPL repo
2013-02-20 01:48:25 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
7893cf238d
Add ndfile.h into llapr.h so it is visible where needed. Add typedef apr_file_t tFiletype to LLAPRFile and then use this in all classes instead of apr_file_t, this way we can swap between LLAPRFile and ndFile with use a typedef
2013-01-23 02:25:14 +01:00
1762586923
Merge LL 3.4.4 beta 1, but left tcmalloc enabled.
2012-12-21 01:14:38 -08:00
eb543deb30
Comment declaration of ndConvertFilename.
2012-11-26 17:18:49 +01:00
0e36b8a9d2
FIRE-8200; MAINT-1901: Make sure to handle unicode filenames for windows.
2012-11-24 02:27:07 +01:00
8d4c6771fd
storm-64: One more toast on failure to verify initial image, and changed a bool to enum
2012-04-10 09:28:47 -04:00
4ff8067aa8
STORM-64: Added toasts to display critical errors during update cycle.
2012-04-09 17:44:27 +03:00
f71ca07998
storm-64: Local Textures
2012-04-02 09:34:14 -04:00
ruslantproductengine