9 Commits

Author	SHA1	Message	Date
Shyotl	008bebd817	Merge with siana/future	2011-10-13 00:03:56 -05:00
Aleric Inglewood	41f13dbf46	Merge branch 'master' of https://github.com/siana/SingularityViewer ... Added missing header to indra/newview/ascentkeyword.cpp now that llviewerpluginmanager.h has a couple of header dependencies less. Resolved Conflicts: indra/llcommon/CMakeLists.txt Proximity: addition of two independent things. Just included both.	2011-05-14 01:06:19 +02:00
Siana Gearz	b3847fdeed	Build fixes	2011-05-11 23:06:49 +02:00
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
Siana Gearz	8d2b56b1eb	Fixed prebuilt fetching, Snowglobe style	2011-05-08 23:25:21 +02:00
Aleric Inglewood	784fdd4f37	Split plugin classes and derive AIFilePicker from BasicPluginBase (part 2). ... This commit contains all changes to indra/llplugin. Since there were no differences at all between Singularity and imprudence before this patch, it's a perfect port.	2011-05-08 17:10:38 +02:00
Siana Gearz	1d6bb3f3ea	Fixed web browser thanks to ArminW/Imprudence	2010-12-24 22:23:32 +01:00
Siana Gearz	e87975b8eb	Fixing media, second part	2010-11-12 00:02:37 +01:00
Hazim Gazov	7a86d01598	Imported existing code	2010-04-02 02:48:44 -03:00