Shyotl 01a8e11ef3 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git ...

Conflicts:
	indra/llcommon/llfasttimer_class.cpp
	indra/llcommon/llfasttimer_class.h

2012-02-05 05:57:44 -06:00

..

cmake

Attempt at fixing a Linux build botch in ReleaseSSE2

2011-12-29 13:39:59 +01:00

copy_win_scripts

…

cwdebug

Generalize how -fPIC is added, even in cwdebug.

2011-05-16 23:49:03 +02: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

Tweaked stream buffer size used in fmodex.

2012-01-30 03:44:20 -06:00

llcharacter

new fasttimers, including ui.

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

llcommon

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

2012-02-05 05:57:44 -06: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

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

2012-02-01 03:10:46 -06:00

llimagej2coj

…

llinventory

Routine V3 merge.

2012-01-29 01:25:39 -06:00

llmath

Octree tweakage.

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

llmessage

Memory tracking system updated.

2012-01-29 01:33:14 -06:00

llplugin

Attempt to fix linking on newer linux

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

llprimitive

A few more translated tidbits. Also converted french strings.xml from BOM with windows lineendings, to non-BOM with unix lineendings.

2012-01-28 22:07:13 -06:00

llrender

I borked up the sUseStreamDraw logic earlier. When its a stream type, and sUseStreamDraw is false, don't use a vbo at all (I mistakenly had it use a dynamic vbo instead). Also, removed an unused (due to being renamed) setting from settings.xml

2012-01-31 02:54:42 -06:00

llui

Pulled apart LLInventoryPanel and LLInventoryView. TODO: LLInventoryView needs to be chopped apart into a floater (LLFloaterInventory) and a panel (LLPanelMainInventory).

2012-01-29 17:10:04 -06:00

llvfs

Merge remote-tracking branch 'origin/master'

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

llwindow

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

2012-01-24 21:22:49 +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

…

mac_updater

…

newview

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

2012-02-05 05:57:44 -06: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

…

tools/vstool

…

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

Merge with siana/future

2011-10-13 00:03:56 -05: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