Aleric Inglewood 87b8f6e076 Merge with siana/master. Resolved conflicts. ...

Conflicts: removal of trailing space (to be the same as
viewer 3) in one instance collided with a patch of Siana.

I had moved isSelfLocked.

2012-03-11 03:21:45 +01:00

..

cmake

Boost: target Windows XP strictly

2012-02-23 15:35:50 +01: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

El crappo. Failed to include this file in earlier commit.

2012-01-28 21:37:19 -06: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

Fixies from viewer-development

2012-03-06 09:01:01 +01:00

llcharacter

new fasttimers, including ui.

2012-01-23 18:30:54 -06:00

llcommon

Merge with siana/master. Resolved conflicts.

2012-03-11 03:21:45 +01: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

Wholesale update of llmessage to V3.2

2012-03-06 07:31:15 +01:00

llimagej2coj

Extra info from j2c decoder in case of cache corruption

2012-02-20 03:47:06 +01:00

llinventory

Fix for libcwd

2012-02-06 22:34:34 +01:00

llmath

Octree tweakage.

2012-01-29 01:27:40 -06:00

llmessage

And of course i forgot to add some files

2012-03-06 09:11:36 +01:00

llplugin

Attempt to fix linking on newer linux

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

llprimitive

Renderer update. Incl mac fixes, DoF improvements, windlight floater code cleanup. (shining-fixes merge)

2012-02-09 14:26:21 -06:00

llrender

First shot at fixing font fallback

2012-03-05 18:18:37 +01:00

llui

LLViewerRegion WIP: brought LLTrans up to speed with V3.

2012-02-18 02:22:49 +01:00

llvfs

Merge remote-tracking branch 'origin/master'

2012-02-01 03:35:10 +01:00

llwindow

First shot at fixing font fallback

2012-03-05 18:18:37 +01:00

llxml

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

2012-01-11 02:28:14 -05:00

lscript

Merge with siana/future

2011-10-13 00:03:56 -05:00

mac_crash_logger

Imported existing code

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

mac_updater

Goodbye updater

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

newview

Merge with siana/master. Resolved conflicts.

2012-03-11 03:21:45 +01:00

plugins

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

test

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

test_apps/llplugintest

Repo cleanup. Sheesh, who packaged pics with a lib?

2011-05-09 00:40:38 +02: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

Imported existing code

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

CMakeLists.txt

Auto-version system

2012-02-09 14:03:49 +01:00

develop.py

Removed the first configure command description and aligned the first two commands with the last two so it looks prettier.

2012-01-13 23:55:49 -05:00