85053e53b6
fix for VWR-22811: crash at LLImageGL::createGLTexture(int,unsigned char const *,int,int) [secondlife-bin llimagegl.cpp] line 1259
2010-09-10 10:26:42 -06:00
ad9330025d
fixed crash on entering build mode
...
(transplanted from 72651623d96deee014411daeb82d50452261e0b3)
2010-08-06 11:03:28 -07:00
a5c80966e7
Backed out changeset 7a739cbdce56
...
A proper fix from Richard is coming next.
2010-08-27 13:47:47 +01:00
1a8d917a6d
lame-but-effective workaround for self-editing UI bug, until the right fix is ready.
2010-08-26 13:09:55 +01:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
50d8cc6d37
first pass ui rendering performance improvements
2010-07-23 22:07:15 -07:00
d2996b6859
EXT-6276 Fix for UI going all wonky.
2010-03-12 13:17:30 -06:00
58afe469f9
Bizarrely hacky fix for EXT-6276 (#if LL_DARWIN out copyFromPrimarySubstring)
...
General gl state cleanup in llui.
Make llrender more gGL.begin/end friendly.
2010-03-12 13:01:50 -06:00
f5c431aa7b
EXT-6276 Put in some gl flush calls to texture state functions.
2010-03-11 16:06:36 -06:00
9aefe34998
EXT-6276 Put in some gl flush calls to register combiner functions (why these are being used for UI now is beyond me)
2010-03-11 15:19:27 -06:00
b214180ac1
a better fix for the blend-factor init problem. I think.
2010-02-13 13:55:41 +00:00
0604715af6
Add support for glBlendFuncSeparate().
...
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
2010-03-07 18:31:32 +00:00
b8739946be
Fix for blend func being screwed up at init.
...
Fix for avatar appearance editor drawing hair in the background.
2010-02-08 19:15:43 -06:00
4538bdd8e9
Fix for bad GL blend function caching.
2010-02-06 20:50:49 -06:00
54a95f706f
merge
2010-02-23 17:19:58 -08:00
7885748497
Turning back on Davep's ui optimizations. Backed out changeset 6c161782dba3
2010-02-23 17:08:06 -08:00
660c3b182c
merge
2010-02-12 21:05:09 -08:00
651b14fcae
Backed out davep's UI optimization. changeset 3134cb7bb181
2010-02-12 21:04:51 -08:00
ff0271d632
merge
2010-02-04 23:43:13 -06:00
979ddb2ec9
No more matrix ops in UI code.
2010-02-04 23:41:54 -06:00
36be134aee
CID-292
...
Checker: UNINIT_CTOR
Function: LLRender::LLRender()
File: /indra/llrender/llrender.cpp
2010-02-03 18:38:52 +00:00
2a00a16f57
EXT-3784 Fix for first menu item going blank when highlighted on ATI cards.
2010-01-11 11:21:52 -06:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +00:00
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00: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
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
6db6d81b0a
Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
...
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
2009-03-05 00:29:27 +00:00
abdc99f21b
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
...
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00
446c55538e
svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
...
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
2009-01-13 03:46:56 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
fb793870fe
QAR-1142 merging 1.22 RC0-RC4 changes.
...
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
f89f19990c
QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-11-07 17:51:03 +00:00
da94c0eaa2
QAR-855 Viewer 1.21 RC 2
...
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
80be4c1d2d
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
...
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
939a506569
Merging in file-move-merge ( QAR-649 )
...
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ."
Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing:
newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files)
newview/llpostprocess.* -> llrender/llpostprocess.*
newview/llrendersphere.* -> llrender/llrendersphere.*
newview/llcubemap.* -> llrender/llcubemap.*
llwindow/llgl.* -> llrender/llgl.*
llwindow/llglstates.h -> llrender/llglstates.h
llwindow/llgltypes.h -> llrender/llgltypes.h
llwindow/llglheaders.h -> llrender/llglheaders.h
2008-06-30 17:57:00 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
Xiaohong Bao