Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,215 Commits 20 Branches 51 Tags
f8aad357758fe6520fa9cd7bbc47aefaa43cb82e
Commit Graph

110 Commits

Author SHA1 Message Date
TighMacFanatic
87cb88f2f7 Fixed CMake issue with Git version when building locally. 2012-02-11 23:04:16 -05:00
Siana Gearz
a3a7f72b7c Limit PCH size sanely 2012-02-09 15:22:07 +01:00
Siana Gearz
acf378e9f2 Auto-version system 2012-02-09 14:03:49 +01:00
Siana Gearz
2ef5673c18 Let's not segfault Lenny's GCC 2012-02-09 02:10:21 +01:00
Siana Gearz
c6ce417fac Attempt at fixing a Linux build botch in ReleaseSSE2 2011-12-29 13:39:59 +01:00
Siana Gearz
23b97efb69 Prebuilt fetch now honors CMake-specified plattform 2011-12-25 05:21:37 +01:00
Siana Gearz
2c8e3bb0a3 More Linux build fixes 2011-12-25 04:28:17 +01:00
Siana Gearz
fd22d80dfd Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
	indra/newview/llmanipscale.cpp
	indra/newview/llmeshrepository.cpp
	indra/newview/llviewerregion.cpp
	indra/newview/llvovolume.cpp
 2011-12-24 20:12:12 +01:00
Siana Gearz
a57ac5a954 Make OpenJPEG respect our build settings 2011-12-23 23:23:55 +01:00
Siana Gearz
29045609a3 Attempt to fix linking on newer linux 2011-12-23 18:31:47 +01:00
Shyotl
c73414f1a1 A stab at fmodex support on windows. To use, install 'FMOD Ex Programmers API' to its defualt program files directory, and run develop.py with -DFMODEX:BOOL=ON set. That /should/ be all it takes. 2011-12-22 18:01:07 -06:00
Drake Arconis
a35ef93d19 Right Click Mouse Scroll Zoom and Xcode fix 2011-10-31 15:43:05 -04:00
Drake Arconis
e5f75d1e48 XCode fixes 2011-10-31 13:24:31 -04:00
Siana Gearz
cc45a24aff Darwin doesn't use extension function pointer mechanism 2011-10-28 02:05:09 +02:00
Siana Gearz
e06d0b2e70 Whoopsie! 2011-10-27 23:02:35 +02:00
Siana Gearz
0281ac4afe There is no glext prebuilt on OS X 2011-10-27 22:39:28 +02:00
Siana Gearz
af74766ead Welcome modern WebKit on Linux 2011-10-13 17:09:16 +02:00
Shyotl
36600462d1 Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing 
Conflicts:
	indra/newview/hippopanelgrids.cpp
	indra/newview/llstartup.cpp
	indra/newview/llsurface.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/llviewerparceloverlay.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworld.cpp
 2011-09-09 16:53:12 -05:00
Shyotl
2d0b2a82ef Updated GL and GLUT headers. Now separate archives, glext and freeglut(only used in test plugin?). 2011-09-01 00:14:40 -05:00
Shyotl
1f187b09ee LLCommon cleanup and updating to V2 (V3 now, I guess.) 2011-08-27 01:57:10 -05:00
Siana Gearz
5f4328767b Debug needs SSE2 now too 2011-08-07 22:40:36 +02:00
Siana Gearz
45c87257ed Debug build fixes, linux32 2011-08-02 01:13:53 +02:00
Siana Gearz
aa469d860f Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future 2011-08-01 19:56:33 +02:00
Shyotl
b258b71e07 Flipped the MESH_ENABLED switch. Added missing components and updated stuff to be closer to mesh-development head. 2011-07-30 20:30:07 -05:00
Siana Gearz
bad84aa608 Merge branch 'master' of git://github.com/siana/SingularityViewer 2011-07-12 21:40:02 +02:00
Siana Gearz
317b8d4ca1 OSX build changes 2011-07-12 21:39:51 +02:00
Siana Gearz
c8e2bdb816 Fix for TCMalloc being linked in wrongly on Linux 2011-07-06 00:12:02 +02:00
Siana Gearz
715f112bad Merge https://github.com/AlericInglewood/SingularityViewer 2011-07-06 00:01:38 +02:00
Siana Gearz
c30fb72669 If someone wants LL_TESTS, they can turn them on themselves 2011-07-03 14:22:45 +02:00
Siana Gearz
73fd876423 OS X build fixes 2011-07-03 14:08:50 +02:00
Aleric Inglewood
0e8be5ff43 Never set -march on STANDALONE. 2011-06-30 03:16:52 +02:00
Siana Gearz
d72cc065e2 More flexible FMOD search 2011-06-29 02:00:13 +00:00
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