Lirusaito fd453593b3 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate ...

Conflicts:
	indra/newview/llfloateravatarinfo.cpp - llpanelprofile.cpp update
	indra/newview/llfloatergroupinfo.cpp - llgroupactions.cpp update
	indra/newview/llfloaterobjectiminfo.cpp - simple merge
	indra/newview/llstartup.cpp - Followed Shyotl's directions from 07165961dc
	indra/newview/llviewermedia.cpp - includes conflict, simple stuff.

SLURL update:
	indra/newview/llavataractions.cpp
	indra/newview/llgroupactions.cpp

2013-06-11 15:32:18 -04:00

..

aistatemachine

Attempt to fix issue 848

2013-05-29 02:37:48 +02:00

cmake

Fortify on release doesn't work and throws warnings on F18

2013-05-27 08:48:45 +02:00

copy_win_scripts

…

cwdebug

Compile bug fixes when -DDEBUG_CURLIO

2013-02-12 23:44:55 +01:00

lib/python

…

libhacd

Forgotten file and fix

2013-05-11 21:46:41 +02:00

libndhacd

Sanitize cmake, cleanup develop.py

2013-05-06 06:07:23 +02:00

libopenjpeg

CMake cleanup and organization

2013-03-05 12:24:51 -05:00

libpathing

Compile fix for libcwd.

2013-05-25 03:19:33 +02:00

linux_crash_logger

…

llappearance

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

2013-05-27 08:09:28 -04:00

llaudio

Fixed some unused variable warnings/errors when not compiling with assertions enabled. (eg 'release' configuration). Also snagged a nullcheck from upstream.

2013-06-06 02:12:45 -05:00

llcharacter

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

2013-05-27 08:09:28 -04:00

llcommon

More WIP moap changes. Browser elements now function, added many required settings and notifications, and fixed some crashes and other bugs.

2013-06-01 05:11:18 -05:00

llcrashlogger

Pass LLControlGroup* to AICurlInterface::startCurlThread instead of each Debug Setting separately.

2013-04-26 16:47:22 +02:00

llimage

CMake cleanup and organization

2013-03-05 12:24:51 -05:00

llimagej2coj

…

llinventory

Fix WARNING: addData: Type mismatch in LLMsgVarData::addData for Set

2013-05-25 22:07:50 +02:00

llmath

Compile fixes (for GCC 4.8)

2013-05-08 00:55:50 -04:00

llmessage

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

2013-06-11 15:32:18 -04:00

llplugin

Fixed crash upon clicking media prim (disabled prim media control floater for now). Fleshed out media browser replacement (LLFloaterWebContent).

2013-06-02 23:47:47 -05:00

llprimitive

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

2013-06-11 15:32:18 -04:00

llqtwebkit

…

llrender

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

2013-05-27 08:09:28 -04:00

llui

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

2013-06-11 15:32:18 -04:00

llvfs

More WIP moap changes. Browser elements now function, added many required settings and notifications, and fixed some crashes and other bugs.

2013-06-01 05:11:18 -05:00

llwindow

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

2013-06-11 15:32:18 -04:00

llxml

Minor cleanup and additional nullchecks.

2013-05-03 14:29:55 -05:00

lscript

Update LSL information (Adds new AnimationOverride)

2013-04-19 23:59:05 +02:00

mac_crash_logger

…

mac_updater

More WIP moap changes. Browser elements now function, added many required settings and notifications, and fixed some crashes and other bugs.

2013-06-01 05:11:18 -05:00

newview

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

2013-06-11 15:32:18 -04:00

plugins

Add top level build directory to gitignore, and mode change on files that certainly shouldn't be executable.

2013-05-17 03:02:57 -04:00

test

Remove LLMemType and related files

2013-03-04 12:02:01 -05:00

test_apps/llplugintest

…

tools/vstool

Revert the last change of VSTool.exe

2013-05-24 06:00:22 +02:00

win_crash_logger

…

win_updater

…

CMakeLists.txt

Remove -Wno-sign-compare and fix DISABLE_FATAL_WARNINGS

2013-04-23 19:37:53 +02:00

develop.py

Sanitize cmake, cleanup develop.py

2013-05-06 06:07:23 +02:00