Shyotl 4d4c49cd24 Merge branch 'master' into V2TextureSystem ...

Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h

2011-04-12 22:29:49 -05:00

..

CMakeLists.txt

Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.

2011-03-31 03:22:01 -05:00

llcubemap.cpp

V2 llrender merge, sans freetype and LLTexture

2011-02-24 18:08:17 -06:00

llcubemap.h

Imported existing code

2010-04-02 02:48:44 -03:00

llfont.cpp

OpenSim crash fixes, thx to Henri and Zauber

2011-03-15 15:26:48 +01:00

llfont.h

OpenSim crash fixes, thx to Henri and Zauber

2011-03-15 15:26:48 +01:00

llfontbitmapcache.cpp

V2 llrender merge, sans freetype and LLTexture

2011-02-24 18:08:17 -06:00

llfontbitmapcache.h

V2 llrender merge, sans freetype and LLTexture

2011-02-24 18:08:17 -06:00

llfontgl.cpp

Merge branch 'master' into V2TextureSystem

2011-04-12 22:29:49 -05:00

llfontgl.h

Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.

2011-03-31 03:22:01 -05:00

llfontregistry.cpp

V2 llrender merge, sans freetype and LLTexture

2011-02-24 18:08:17 -06:00

llfontregistry.h

V2 llrender merge, sans freetype and LLTexture

2011-02-24 18:08:17 -06:00

llgl.cpp

LLGLState::sStateMap now using hash map (boost::unordered_map) opposed to std::map

2011-03-24 05:03:21 -05:00

llgl.h

LLGLState::sStateMap now using hash map (boost::unordered_map) opposed to std::map

2011-03-24 05:03:21 -05:00

llgldbg.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

llgldbg.h

Imported existing code

2010-04-02 02:48:44 -03:00

llglheaders.h

V2 llrender merge, sans freetype and LLTexture

2011-02-24 18:08:17 -06:00

llglimmediate.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

llglimmediate.h

Imported existing code

2010-04-02 02:48:44 -03:00

llglslshader.cpp

Reduced LL's leakage of program/shader objects, drastically.

2011-02-10 18:21:38 -06:00

llglslshader.h

Reduced LL's leakage of program/shader objects, drastically.

2011-02-10 18:21:38 -06:00

llglstates.h

Merge branch 'master' of git://github.com/siana/SingularityViewer.git

2011-03-25 17:54:52 -05:00

llgltypes.h

Imported existing code

2010-04-02 02:48:44 -03:00

llimagegl.cpp

Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.

2011-03-31 03:22:01 -05:00

llimagegl.h

Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.

2011-03-31 03:22:01 -05:00

llpostprocess.cpp

Fixed snapshot floater failing to render overlay texture when full-screen preview is enabled

2011-02-16 18:19:22 -06:00

llpostprocess.h

Removed bloom tab from post-process menu.

2011-02-15 17:19:23 -06:00

llrender.cpp

Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.

2011-03-31 03:22:01 -05:00

llrender.h

Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.

2011-03-31 03:22:01 -05:00

llrendersphere.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

llrendersphere.h

Imported existing code

2010-04-02 02:48:44 -03:00

llrendertarget.cpp

V2 llrender merge, sans freetype and LLTexture

2011-02-24 18:08:17 -06:00

llrendertarget.h

V2 llrender merge, sans freetype and LLTexture

2011-02-24 18:08:17 -06:00

llshadermgr.cpp

Reduced LL's leakage of program/shader objects, drastically.

2011-02-10 18:21:38 -06:00

llshadermgr.h

Reduced LL's leakage of program/shader objects, drastically.

2011-02-10 18:21:38 -06:00

lltexture.cpp

Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.

2011-03-31 03:22:01 -05:00

lltexture.h

Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.

2011-03-31 03:22:01 -05:00

llvertexbuffer.cpp

More STORM-1026 LL fixes.

2011-03-14 17:03:34 -05:00

llvertexbuffer.h

Deferred has sky and water textures now. Underwater is still borked.

2011-03-10 23:06:46 -06:00