| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  | crashing the viewer.
No need to test because there are no negative effects. | 
|  | altitude flicker though (STORM-306) | 
|  | back-out the back-out for this branch.  yay. | 
|  | Backing out this merge that I pushed (prematurely) to the wrong place. | 
|  |  | 
|  |  | 
|  | added more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D | 
|  |  | 
|  |  | 
|  | I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes. | 
|  | Self reviewed. | 
|  | ignore-dead-branch | 
|  | (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 | 
|  | svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | 
|  | svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge | 
|  | merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme | 
|  |  | 
|  | merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated | 
|  | 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 |