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

182 Commits (b260451633e5749baa5f744461406e56e45a4e14)

Author SHA1 Message Date
Nicky b260451633 Merge. 2015-11-09 12:21:49 +01:00
rider bd817f6f42 MAINT-5754: Basic keyboard functionality on the Mac. Still incomplete 2015-11-06 14:12:30 -08: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
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
ruslantproductengine befb4449dc MAINT-3585 FIXED (Crashes when attempting to upload image.) 2015-03-30 20:11:27 +03: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
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
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 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 a45088cb6b Merge LL V3.7.11 2015-01-12 12:54:15 +01: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
Mnikolenko ProductEngine c62ac0cae7 MAINT-3569 FIXED Handle window hide/unhide and minimize/unminimize events on mac. 2014-09-11 11:59:19 +03:00
Pell Smit ebd94bf07a fixed: unwanted input window on OSX 2014-08-15 03:52:22 +09:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
Cinder Biscuits 1173dde898 Remove calls to now unused methods 2014-04-18 21:05:20 +00:00
Cinder Biscuits b533844945 STORM-2023: Restore system color picker on OSX 2014-04-18 20:06:39 +00:00
Cinder 3c3d74e487 STORM-2081 - Guard against null gWindowImplementation when fullscreen (crashes OS X Yosemite) 2014-10-23 12:45:05 -06:00
Nicky 2455a0a8e0 Replaced even deprecated logging macros. 2014-06-11 18:24:52 +02:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Tonya Souther 1159ca7b87 Legacy cursor fix for OS X. 2014-05-21 08:49:44 -05:00
Nicky f6fd30d5c7 Compile fix for OSX. Partially disables legacy cursors. 2014-05-21 14:50:00 +02:00
Liny 5667f6806e Proper fix for max OSX compiling. 2014-05-20 12:40:30 -07:00
Ansariel bfcca01e5c Hello, legacy cursor bug... 2014-05-20 21:05:00 +02:00
Liny 97a45e7597 Cleaning up legacy cursors and adding merge guard comments on changed code 2014-05-19 16:54:18 -07:00
Liny c9719151d9 Fix legacy cursor hotspots on mac and linux builds 2014-05-18 20:28:10 -07:00
Liny ee88720b8a Backed out changeset: ec54b058227c 2014-05-18 20:02:31 -07:00
Ansariel 6a74754813 Dump broken legacy V1 cursors nobody seem to fix, miss or care about for over 2 years 2014-05-14 19:13:46 +02:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Aura Linden 976ad95977 Shot in the dark patch for MAINT-3353 backported from viewer-tiger 2013-11-05 13:01:25 -08:00
Oz Linden 9c313aea13 merge changes for DRTVWR-336 2013-10-15 17:47:37 -04:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Richard Linden fe24e442a6 BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macros 2013-08-14 20:50:26 -07:00
Jeff (Gioffredo Linden) ee0b66f080 VITA test framework - record events support 2013-07-25 16:07:16 -04:00
Geenz 6ca0bbe336 Fix for BUG-3364 2013-07-23 10:39:32 -04:00
Geenz 2f680eec93 A bit of cleanup and make the return of showAlert match the OSBTN return types in llwindow.h. 2013-07-11 21:46:10 -04:00
Geenz a787e272c3 Alert box support! 2013-07-11 21:31:17 -04:00
Geenz dc7d287717 OPEN-170: "Set Window Size" always increases window size by specified size 2013-07-11 19:41:57 -04:00
Geenz b2bec3f99c STORM-1942: dock icon bouncing unimplemented 2013-07-11 19:37:08 -04:00
Geenz 2837ca7a47 This seems to be on par with viewer-release at this point. 2013-06-17 17:08:48 -04:00
Geenz cda10266ae Only show the input window when we attempt to add marked text, *and* we can't submit marked text directly to the viewer. 2013-05-23 08:50:05 -04:00