livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,613 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

606 Commits (19c9bbae355dcacbbcd78eebd6604dfd83006a73)

Author SHA1 Message Date
Ansariel 68739bc569 Merge Viewer-Bear 2015-10-27 01:31:15 +01:00
AndreyL ProductEngine b0b8d34b15 Merged viewer-xcode-7 2015-10-26 18:00:12 +02:00
callum_linden 17ff449ae6 Supress error after Xcode 7 update: error: null passed to a callee that requires a non-null argument 2015-09-18 15:07:27 -07:00
Ansariel 5fe09cb64d Merge Viewer-Bear 2015-08-22 03:13:17 +02:00
Ansariel 286430cf15 Unsafe Win64 code fix by Drake Arconis 2015-07-17 11:56:21 +02:00
AndreyL ProductEngine 078612e292 MAINT-5019 FIXED Additional cases 2015-07-14 04:39:20 +03:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
pavelk_productengine e92e72ff3a MAINT-5106 FIXED [MAC] if SL viewer is not running, clicking on SLURL launches viewer, BUT start location is not set 2015-04-24 23:24:44 +03:00
Mnikolenko ProductEngine bb87365c37 Merge viewer-release, become version 3.7.29 2015-04-28 13:36:35 +03:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
ruslantproductengine 90573badb4 MAINT-3585 FIXED (Crashes when attempting to upload image.) 2015-03-30 20:11:27 +03:00
ruslantproductengine a6ff7db101 MAINT-3585 FIXED (Crashes when attempting to upload image.) 2015-03-30 20:11:27 +03:00
andreykproductengine de5307ab1d MAINT-4874 FIXED Actions that require a double click "randomly" fail - repro & cause found for BUG-7753 2015-03-05 19:03:23 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Oz Linden 905431cf60 merge changes for 3.7.25-release 2015-02-24 15:48:28 -05:00
Oz Linden 6f3cf79a3a merge changes for 3.7.24-release 2015-01-13 13:46:45 -05:00
Oz Linden dab5acd972 merge changes for 3.7.22-release 2014-12-15 12:34:18 -05:00
callum_linden 4c597c548f Fix up remaining llround() -> ll_round() issues 2014-12-12 11:03:56 -08:00
simon 4f076daeff Merge downstream code and become 3.7.22 2014-12-02 10:41:20 -08:00
Brad Payne (Vir Linden) 6cffbfba8b merge 2014-12-02 14:48:45 -05:00
Brad Payne (Vir Linden) fe5ff3e74a merge 2014-12-01 16:21:52 -05:00
ruslantproductengine 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
Oz Linden a837281a77 merge changes for STORM-2081 2014-10-23 16:07:31 -04:00
Cinder 47854b6218 STORM-2081 - Guard against null gWindowImplementation when fullscreen (crashes OS X Yosemite) 2014-10-23 12:45:05 -06:00
callum_linden 392d63efac Update to build on Xcode 6.0: more removal of unused variables [-Wunused-variable] 2014-10-17 15:39:48 -07:00
callum_linden 73224a952a Update to build on Xcode 6.0: fix deprecated constant in OS X land 2014-10-17 15:39:13 -07:00
Oz Linden e43f3f4dae merge changes for OPEN-215 2014-10-13 17:21:22 -04:00
Oz Linden 852426d71e merge changes for 3.7.17-release 2014-10-13 17:13:15 -04:00
Ansariel 92cebdf6a7 FIRE-15891: Add option to disable WMI check in case of problems 2015-04-19 11:51:26 +02:00
andreykproductengine cfba0b8b8b MAINT-4874 FIXED Actions that require a double click "randomly" fail - repro & cause found for BUG-7753 2015-03-05 19:03:23 +02:00
Ansariel 4d840e00a2 Backup f9628f6e4492 (temporary fix for FIRE-15529) - LL fix is coming next 2015-04-17 00:57:24 +02:00
ruslantproductengine befb4449dc MAINT-3585 FIXED (Crashes when attempting to upload image.) 2015-03-30 20:11:27 +03:00
ruslantproductengine 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
Ansariel e7d5e9f368 Fix mem leak in glh_extensions.h by Drake Arconis 2015-02-28 17:15:49 +01:00
Tank_Master 22386b18b4 Merge LL 2.7.25 2015-02-24 21:22:32 -08:00
Ansariel 3f7fd62bea FIRE-15529: Possible fix for double clicks not working after giving focus back to the viewer 2015-02-11 13:25:26 +01:00
Ansariel 998ccb3fee FIRE-15500: Restore fix for FIRE-11648 that got lost in the merge with LL V3.7.21 2015-02-08 02:11:07 +01:00
Ansariel e52d57cba2 Merge LL V3.7.23 2015-01-15 15:44:43 +01:00
Ansariel 99cbf150a0 Merge LL V3.7.21 2015-01-15 13:55:17 +01:00
Ansariel 48fc17d6e1 Merge LL V3.7.16 2015-01-14 17:36:30 +01:00
Ansariel a1fd8230bf Merge LL V3.7.12 2015-01-12 17:56:50 +01:00
Ansariel a45088cb6b Merge LL V3.7.11 2015-01-12 12:54:15 +01:00
Ansariel e1ce6e3d58 Merge Firestorm LGPL tip 2015-01-08 23:12:58 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
Mnikolenko ProductEngine b75d2f7c3f MAINT-3666 FIXED Update modifiers when viewer window becomes key window 2014-09-12 11:30:52 +03:00
Mnikolenko ProductEngine c62ac0cae7 MAINT-3569 FIXED Handle window hide/unhide and minimize/unminimize events on mac. 2014-09-11 11:59:19 +03:00
Nicky a755c04c29 Make OSMessageBoxWin32 displays proper extended characters. 2014-10-01 17:12:55 +02:00
Mnikolenko ProductEngine 7d9372b96d MAINT-4323 FIXED Mouselook - right-click locks cam position (mac-only) 2014-09-04 14:13:47 +03:00
Pell Smit ce7e8eb952 fixed: bad behavior of input window 2014-08-14 15:19:19 +09:00
Pell Smit ebd94bf07a fixed: unwanted input window on OSX 2014-08-15 03:52:22 +09:00