Aleric Inglewood 133391be90 Merge branch 'master' of https://github.com/siana/SingularityViewer ...

Resolved Conflicts:
	indra/newview/llviewermedia.cpp
	indra/plugins/base_media/CMakeLists.txt

Trivial fix for indra/newview/llviewermedia.cpp.
Moved 'prepare' dependency from base_media to
base_basic because media already depends on basic.

2011-05-10 04:46:58 +02:00

..

CMakeLists.txt

Imported existing code

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

lldir_linux.cpp

LindenUserDir fixes.

2011-05-04 17:54:57 +02:00

lldir_linux.h

Imported existing code

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

lldir_mac.cpp

mac SLPlugin search path

2011-02-06 00:37:04 +01:00

lldir_mac.h

Imported existing code

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

lldir_solaris.cpp

LindenUserDir fixes.

2011-05-04 17:54:57 +02:00

lldir_solaris.h

Imported existing code

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

lldir_win32.cpp

Spell check added

2011-04-23 18:08:59 -04:00

lldir_win32.h

Imported existing code

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

lldir.cpp

Use AIFilePicker everywhere.

2011-05-10 04:27:57 +02:00

lldir.h

LindenUserDir fixes.

2011-05-04 17:54:57 +02:00

lllfsthread.cpp

Cleaned up a few minor things

2011-03-27 18:50:04 -05:00

lllfsthread.h

Imported existing code

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

llpidlock.cpp

Merge git://github.com/AlericInglewood/SingularityViewer

2011-05-08 19:39:32 +02:00

llpidlock.h

Fix underlinkage of libmedia_plugin_webkit.so

2011-05-02 23:13:15 +02:00

llvfile.cpp

Put in some changes along sg1.4 dev history.

2010-11-21 15:57:44 +01:00

llvfile.h

A few variables were uninitialized.

2011-05-04 19:54:03 -05:00

llvfs.cpp

Added a thread-safe and robust wrapper for APR pools.

2011-05-05 02:52:55 +02:00

llvfs.h

fix a couple of things for the vfs explorer

2010-06-26 17:27:48 +00:00

llvfsthread.cpp

Imported existing code

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

llvfsthread.h

Imported existing code

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