Commit Graph

7 Commits

Author SHA1 Message Date
Siana Gearz
e835d51bdf Revert "Crude port of megaregion mem corruption fix, by Rev"
This reverts commit 6b60fe40c6.
2012-01-14 05:33:05 +01:00
Shyotl
36600462d1 Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing
Conflicts:
	indra/newview/hippopanelgrids.cpp
	indra/newview/llstartup.cpp
	indra/newview/llsurface.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/llviewerparceloverlay.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworld.cpp
2011-09-09 16:53:12 -05:00
Shyotl
fd317a4092 newview V3 partial merge. 2011-08-30 01:05:59 -05:00
Siana Gearz
6b60fe40c6 Crude port of megaregion mem corruption fix, by Rev 2011-08-18 22:15:18 +02:00
Shyotl
e756140e1d Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
Need to test:
localassetbrowser
preview related floaters
hgfloatertexteditor
maps
media textures! Currently very hacky
web browser
alpha masks on avatars
bumpmaps
Are all sky components appearing?
LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc)
Snapshot related features
Customize avatar
vfs floater
UI textures in general
Texture priority issues
2011-03-31 03:22:01 -05:00
siana
d65a5ffeb7 Assorted DN and RLVa fixes from Phoenix 2011-01-02 02:05:32 +01:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00