Siana Gearz f05edda4f4 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear ...

Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloatermessagelog.cpp
	indra/newview/llstartup.cpp
	indra/newview/llviewermenu.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/menu_inventory.xml

2012-03-28 22:27:45 +02:00

..

cmake

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

2012-03-28 22:27:45 +02:00

copy_win_scripts

…

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

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

2012-03-28 22:27:45 +02:00

llcommon

Fixies from viewer-development

2012-03-06 09:01:01 +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

Another stab at making textures work as they should

2012-03-27 16:23:55 +02:00

llimagej2coj

In hindsight, not letting OpenJPEG to error out nicely was a bad idea.

2012-03-28 00:26:56 +02: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

Catching up with Lindies part 3

2012-03-26 15:01:53 +02:00

llplugin

Attempt to fix linking on newer linux

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

llprimitive

Innitial commit. Pulled minor changes out of bulk of changes comming for multi-wearables.

2012-02-16 12:00:38 -06:00

llrender

Fixies, missed files

2012-03-28 01:45:10 +02:00

llui

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

2012-03-28 22:27:45 +02:00

llvfs

Merge remote-tracking branch 'origin/master'

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

llwindow

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

2012-03-28 22:27:45 +02:00

llxml

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

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

llxuixml

Added LLInitParam. Not yet plugged into xml parsing.

2012-02-24 20:16:33 -06:00

lscript

Merge with siana/future

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

mac_crash_logger

…

mac_updater

…

newview

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

2012-03-28 22:27:45 +02: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

Added LLInitParam. Not yet plugged into xml parsing.

2012-02-24 20:16:33 -06: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