Commit Graph

78 Commits

Author SHA1 Message Date
Aleric Inglewood
425e1581ae Port to boost::signals2 2011-06-09 15:25:03 +02:00
Aleric Inglewood
5d87098bd0 Port Viewer 2 indra/llvfs
This introduces some API changes, like the new LLDirIterator,
that causes changes elsewhere.

It also include Log Linden's cache changes that aren't in
viewer-development yet that increase the maximum cache size
to ~10 GB.
2011-06-06 21:38:58 +02:00
Shyotl
71eec1caed Improved error handling (introduced debugsession commandline argument). Startup/shutdown now more verbose. SSE checks if project was compiled with SSE(2)... not sure if windows would reach it if hardware lacked support, but linux/mac may (from V2). Fixed Mac crashes in deferred. 2011-05-28 01:46:11 -05:00
Shyotl
77f09744ab Merge branch 'AlericMaster' into V2Renderer
Conflicts:
	indra/llcommon/aithreadsafe.h
	indra/newview/pipeline.cpp
2011-05-20 12:56:23 -05:00
Siana Gearz
1327c80dd7 Don't assume we have perftools 2011-05-18 15:41:14 +02:00
Siana Gearz
adeba18356 GCC 4.6 fixes 2011-05-16 01:37:00 +02:00
Aleric Inglewood
ea2cc3e0de Make FilePicker context sensitive default paths persistent over logins.
Also, make newview/statemachine a separate project.
2011-05-13 23:50:56 +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
8227efcaf1 Make our build and packaging shine again 2011-05-09 13:35:51 +02:00
Siana Gearz
e371c2e93d Repo cleanup. Sheesh, who packaged pics with a lib? 2011-05-09 00:40:38 +02:00
Siana Gearz
8d2b56b1eb Fixed prebuilt fetching, Snowglobe style 2011-05-08 23:25:21 +02:00
Shyotl
1a099167ae Fixing Win compile. (Partial) 2011-05-08 20:34:32 +02:00
Siana Gearz
e2e576e550 Merge git://github.com/AlericInglewood/SingularityViewer
Conflicts:
	indra/newview/skins/default/xui/en-us/mime_types.xml
2011-05-08 19:39:32 +02:00
Aleric Inglewood
80bbf5d083 Fix underlinkage of libmedia_plugin_gstreamer.so
Needed for the newer plugin code. This is basically just a copy
of indra/cmake/GStreamer010Plugin.cmake from Imprudence.
2011-05-08 17:32:05 +02:00
Aleric Inglewood
e89d6d9d66 Split plugin classes and derive AIFilePicker from BasicPluginBase (part 1).
This commit contains all changes, except those in indra/media_plugins
(which was renamed to indra/plugins) and indra/llplugin.

However, it does contain the (new) file
indra/plugins/filepicker/basic_plugin_filepicker.cpp
2011-05-08 17:10:38 +02:00
Aleric Inglewood
474acdbff9 Add support for libcwd.
This patch has no influence if you don't have libcwd installed.
Note that libcwd (http://libcwd.sourceforge.net/) is only
available for linux.

A default compile of libcwd does memory allocation tracking,
which is too slow for everyday usage of the viewer (usable,
but notably slower) and we don't need that. Configure your
libcwd as follows:

./configure --prefix=/sl/usr --disable-alloc --enable-optimize

Or whatever prefix you prefer (add --enable-maintainer-mode
if you're compiling it from the SVN repository), add
--disable-nonthreading to compile twice as fast.

If you have it installed you can activate it's use by setting a
few environment variables:

CXXFLAGS="$(pkg-config --cflags libcwd_r)"
LDFLAGS="$(pkg-config --libs libcwd_r) -lpthread"

and then reconfiguring the viewer.

The -lpthread is needed when using ld.gold, however, if you
leave it out you might get an LDFLAGS that ends on trailing
whitespaces, which doesn't work for some reason.

Also, if you installed it in a non-standard place (/sl/usr
above) then you need this to run the viewer (and tests):

export LD_LIBRARY_PATH="/sl/usr/lib"
2011-05-08 17:08:48 +02:00
Aleric Inglewood
0fa396938b Merge branch 'master' of https://github.com/siana/SingularityViewer 2011-05-05 15:54:21 +02:00
Siana Gearz
eedc1f79ec Resolve stray VC8 CRT dependency by updating libs 2011-05-05 03:20:54 +02:00
Aleric Inglewood
f2199a504b More various small, old patches.
Updated source tree to include everything I did
up till 2010-11-09.

Still to add: IMP-590, IMP-701, IMP-734, IMP-735 and IMP-702.
2011-05-04 19:48:16 +02:00
Aleric Inglewood
ccaa494e85 Updated doc/contributions.txt and added various missing patches from imprudence.
This updates the source tree with patches that I committed to
imprudence up till and including 2010-10-19.
2011-05-04 15:52:25 +02:00
Aleric Inglewood
6848c2df6f Fix underlinkage of libmedia_plugin_webkit.so
Fixed by updating indra/cmake/WebKitLibPlugin.cmake with
version from imprudence.

This commit also contains removal of execute permissions
of source files and configure files, sorry...
2011-05-02 23:13:15 +02:00
Aleric Inglewood
c0c786b39f Make loading prebuilts work.
Copied indra/cmake/Prebuilt.cmake from imprudence,
which fixed this issue.
2011-05-02 20:50:26 +02:00
Aleric Inglewood
094587aefd Make viewer compile on standalone linux x86_64
This involves making libllcommon shared, a change
that was not finished for windows/Mac.
More changes are needed to indra/newview/viewer_manifest.py
for those two operating systems, as well as to
indra/copy_win_scripts.

I did not test this on linux 32bit, nor non-standalone
on that OS, either.

I did not check voice (which will very likely not work
anyway on 64bit). And currently the webkit plugin doesn't
work for me, but I'll fix that in a different commit.
2011-05-02 19:40:33 +02:00
Aleric Inglewood
b7aaef7e91 Set appropriate compiler options for x86_64.
Using -march=pentium4 break compilation on 64bit.
A pentium isn't a 64bit cpu.
The used options were copied from imprudence.
2011-05-02 15:15:23 +02:00
Aleric Inglewood
b5a0d80cd7 Merge remote-tracking branch 'origin/master' 2011-05-02 04:39:29 +02:00
Aleric Inglewood
9bcc08df1a Don't barf when Google PerfTools are not found, but simply disable it.
Plus bug fix (missing NOT): in the case that USE_GOOGLE_PERFTOOLS
is not set we DON'T want to build with Google TCMalloc.
2011-05-02 04:36:47 +02:00
Siana Gearz
2ba1dbf9da Unbotch Aleric 2011-05-01 23:04:18 +02:00
Aleric Inglewood
26c40255aa Remove CR from configuration, source and xml files. 2011-05-01 22:16:05 +02:00
Aleric Inglewood
7edb98743d Add missing cmake/FindLLQtWebkit.cmake 2011-05-01 22:04:28 +02:00
Aleric Inglewood
6b8a12dd06 Rename FindZLIB.cmake to FindMyZLIB.cmake to avoid cmake warning. 2011-05-01 22:01:02 +02:00
tmac@latestevidence.com
af203533b3 Spell check added 2011-04-23 18:08:59 -04:00
siana
d4b6ece24b Unbotch jsoncpp 2011-03-21 04:17:00 +01:00
siana
611b8f48d6 VC10 fixes 2011-03-21 03:13:49 +01:00
siana
15c01ed310 Merge remote branch 'shyotl/V2Renderer'
Conflicts:
	indra/cmake/00-Common.cmake
2011-03-20 04:55:56 +01:00
siana
472dade93a More build/package fixes 2011-03-19 00:14:20 +01:00
siana
3b567d3eae VC10 transition, Webkit 4.7.1 2011-03-18 01:33:47 +01:00
Shyotl
77b5ac28e6 Oh cmake. You so silly. VS2010 wchar_t fix 2011-03-17 00:37:18 -05:00
Siana Gearz
5882ea5643 Better RelWithDebInfo flags on Linux 2011-03-15 16:24:11 +01:00
Siana Gearz
633b6d22f2 Emerald Local Assets 2011-03-03 03:30:58 +01:00
siana
31b3c8e755 Singularity 1.5.4(2) fixes 2011-02-21 15:15:55 +01:00
siana
36339d2fba Saner compiler flags, hopefully 2011-02-20 23:07:33 +01:00
siana
4069151bc2 llqtwebkit 1.6, static apr on windows 2011-02-20 04:11:05 +01:00
Siana Gearz
34e7773be3 Merge remote branch 'shyotlsv/master' 2011-02-16 21:05:57 +01:00
Siana Gearz
8c02c2bb08 Compile flags 2011-02-16 20:22:45 +01:00
Shyotl
000f102722 Backwards compatability for pre VC9 installs lacking updated resource compiler. (Uses pre-vista icon format)
To support newer icon with VC8:
 -Replace VC/bin/rcdll.dll with newer from Windows SDK 7.0
 -Run develop.py with -DVISTA_ICON:BOOL=ON setting
2011-02-15 17:17:45 -06:00
Shyotl
dfc99b4165 Resolved header conflict between linux/darwin/win32 by moving ares and curl headers relevant target subdirectories.
Stemmed around the downloaded archives having differing headers and overwriting eachother.
2011-02-15 04:11:47 -06:00
narv
12fded401e Build with GCC 4.2 on Darwin 2011-02-02 15:17:31 -07:00
Siana Gearz
77fc0e82c8 Linux version 2011-01-04 02:00:25 +01:00
Siana Gearz
037593aa99 Google tcmalloc 2011-01-01 02:56:41 +01:00
siana
784ef47048 Tag, settings 2010-12-26 01:53:36 +01:00