Siana Gearz c84e145557 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer ...

Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/lloverlaybar.cpp

2012-08-09 02:11:14 +02:00

..

cmake

Clean up and updates

2012-07-20 08:13:07 -04:00

copy_win_scripts

Branding pt2

2010-11-15 10:45:16 +01:00

cwdebug

New libcwd debug channel CAPS.

2012-02-16 02:30:14 +01:00

lib/python

Removed ReleaseSSE2

2012-07-04 10:25:04 +00:00

libopenjpeg

Remove compiler warning 'cast from pointer to integer of different size'.

2012-01-22 01:50:25 +01:00

linux_crash_logger

Attempt to fix linking on newer linux

2011-12-23 18:31:47 +01:00

llaudio

Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

2012-08-09 00:42:23 +02:00

llcharacter

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

2012-08-09 02:11:14 +02:00

llcommon

Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

2012-08-09 00:42:23 +02:00

llcrashlogger

Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights

2012-01-09 05:40:03 -05:00

llimage

Clean up and updates

2012-07-20 08:13:07 -04:00

llimagej2coj

Lindie viewer-dev catchup regarding rendering pipeline.

2012-06-30 20:05:31 -05:00

llinventory

Further header cleanup and a few updates

2012-07-21 03:01:42 -04:00

llmath

MAINT-646: Factor std::vector out of lloctree https://bitbucket.org/davep/viewer-development/changeset/efcec3eb374f

2012-07-18 01:03:54 -05:00

llmessage

Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

2012-08-09 00:42:23 +02:00

llplugin

Build SLPLugin.exe without tcmalloc, for SkyDrive

2012-07-19 03:24:44 +02:00

llprimitive

Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

2012-08-09 00:42:23 +02:00

llrender

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

2012-08-09 02:11:14 +02:00

llui

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

2012-08-09 02:11:14 +02:00

llvfs

Avoid dead lock in LLQueuedThread::generateHandle / LLTextureFetchWorker::callbackDecoded

2012-07-22 04:13:23 +02:00

llwindow

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

llxml

Minor llxmlnode updated. Tracks line numbers and ostream format is a bit nicer.

2012-06-15 09:52:35 -05:00

lscript

Updated lscript, a bit, to match upstream.

2012-06-19 16:16:39 -04:00

mac_crash_logger

…

mac_updater

Goodbye updater

2011-01-25 05:50:49 +01:00

newview

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

2012-08-09 02:11:14 +02:00

plugins

Uhm..

2012-07-22 23:41:09 -04:00

test

Removed exportFileXML, and importXML, updated indra/test's

2012-07-03 10:07:14 -04:00

test_apps/llplugintest

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

tools/vstool

VC2010 cmake alterations. Lib stuff not included.

2010-10-05 01:34:35 -05:00

win_crash_logger

LLStringOps, LLStringUtilBase, and LLDate updated to V2. If dates go wonky this is where it's from

2011-05-15 22:50:56 -05:00

win_updater

…

CMakeLists.txt

Clean up and updates

2012-07-20 08:13:07 -04:00

develop.py

Removed ReleaseSSE2

2012-07-04 10:25:04 +00:00