Age | Commit message (Collapse) | Author |
|
|
|
(transplanted from a149524a63039870704a498952d9bb3aa599b472)
|
|
(transplanted from 8476304a30a3c387a722b33743ef3385e85f85a0)
|
|
|
|
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
|
|
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
|
|
|
|
|
|
(transplanted from a149524a63039870704a498952d9bb3aa599b472)
|
|
(transplanted from 8476304a30a3c387a722b33743ef3385e85f85a0)
|
|
|
|
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
|
|
Checker: UNINIT_CTOR
Function: LLGLManager::LLGLManager()
File: /indra/llrender/llgl.cpp
--HG--
branch : product-engine
|
|
|
|
|
|
needed/useful (when threading is revisited).
|
|
Self reviewed.
|
|
|
|
ignore-dead-branch
|
|
Ok, finally got this to a point where it doesn't break the build and I can check
in. llcommon can be built as a shared library (disabled but can be enabled with
cmake cache var LLCOMMON_LINK_SHARED.
reviewed by Mani on tuesday (I still need to get his suggested changes
re-reviewed)
|
|
(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 merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
|
|
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
|
|
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
|
|
merge viewer_1-21 94770-96059 -> release
|
|
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
|